From 92eaf3a020b20281b8b6a396027338759866e6f4 Mon Sep 17 00:00:00 2001
From: PortPixel <profjck@gmail.com>
Date: Mon, 11 Jul 2016 13:50:37 +0100
Subject: [PATCH] Update server.js

---
 src/server/server.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);