From 2e4e90b9c7d0ac3aecf2e63262441b0e61984e7c Mon Sep 17 00:00:00 2001 From: PortPixel Date: Mon, 11 Jul 2016 15:25:57 +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 87bcf1c20..255ca5d97 100644 --- a/src/server/server.js +++ b/src/server/server.js @@ -534,7 +534,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))*10.75 ) { - if (collision.aUser.mass > collision.bUser.mass * 1.1 && util.massToRadius(collision.aUser.mass) > Math.sqrt(Math.pow(collision.aUser.x - collision.bUser.x, 2) + Math.pow(collision.aUser.y - collision.bUser.y, 2))*10.75 ) { + if (collision.aUser.mass > collision.bUser.mass * 1.1 && util.massToRadius(collision.aUser.mass) > Math.sqrt(Math.pow(collision.aUser.x - collision.bUser.x, 2) + Math.pow(collision.aUser.y - collision.bUser.y, 2))*0.075 ) { console.log('[DEBUG] Killing user: ' + collision.bUser.id); console.log('[DEBUG] Collision info:'); console.log(collision);