diff --git a/src/server/server.js b/src/server/server.js index c015320bb..87bcf1c20 100644 --- a/src/server/server.js +++ b/src/server/server.js @@ -533,7 +533,8 @@ 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 && 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 ) { console.log('[DEBUG] Killing user: ' + collision.bUser.id); console.log('[DEBUG] Collision info:'); console.log(collision);