Update server.js

owenashurst · Jul 11, 2016 · 92eaf3a · 92eaf3a
1 parent 220f37b
commit 92eaf3a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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);