From d06e1fd4478b3de2f09572f9360bd5f5e9a55fd6 Mon Sep 17 00:00:00 2001 From: PortPixel Date: Mon, 11 Jul 2016 12:06:48 +0100 Subject: [PATCH] Update server.js --- src/server/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/server.js b/src/server/server.js index 4c0c3db19..709c2c2cb 100644 --- a/src/server/server.js +++ b/src/server/server.js @@ -532,7 +532,7 @@ function tickPlayer(currentPlayer) { } function collisionCheck(collision) { - if (collision.aUser.mass > collision.bUser.mass * 1.1 /* && collision.aUser.radius > Math.sqrt(Math.pow(collision.aUser.x - collision.bUser.x, 2) + Math.pow(collision.aUser.y - collision.bUser.y, 2))*1.75*/) { + if (collision.aUser.mass > collision.bUser.mass * 1.1 && collision.aUser.radius > Math.sqrt(Math.pow(collision.aUser.x - collision.bUser.x, 2) + Math.pow(collision.aUser.y - collision.bUser.y, 2))*1.75) { console.log('[DEBUG] Killing user: ' + collision.bUser.id); console.log('[DEBUG] Collision info:'); console.log(collision);