From 0f31b264279c6c6abad5649b77e06d98b30ec014 Mon Sep 17 00:00:00 2001 From: PortPixel Date: Tue, 12 Jul 2016 11:43:33 +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 668179b15..1f444a8d7 100644 --- a/src/server/server.js +++ b/src/server/server.js @@ -536,7 +536,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))*0.075 ) { + if (collision.aUser.mass > collision.bUser.mass * 1.1 && 200 > 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);