diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java index 3577036..297ab44 100644 --- a/src/main/java/cactusServer/models/CollisionManager.java +++ b/src/main/java/cactusServer/models/CollisionManager.java @@ -47,7 +47,7 @@ Instance instance = Instances.getInstance().getInstance(instanceId); instance.getUniverse().update(interval); collisionPlayersObjects(instanceId, instance); -// collisionBulletsAndOthers(instanceId, instance); + collisionBulletsAndOthers(instanceId, instance); } } @@ -130,7 +130,7 @@ } private void collisionBulletsAndOthers(String instanceId, Instance instance) { -// collisionBulletAndOtherBullets(instance); + collisionBulletAndOtherBullets(instance); for (Map.Entry> playersBulletsEntry : instance.getBullets().entrySet()) { String bulletOwnerPlayerId = playersBulletsEntry.getKey(); Map bulletMap = playersBulletsEntry.getValue(); @@ -138,9 +138,9 @@ Bullet bullet = bulletEntry.getValue(); if (!bullet.isAlive()) continue; String bulletId = bulletEntry.getKey(); -// collisionBulletAndPlayers(instanceId, instance, bulletOwnerPlayerId, bulletId, bullet); + collisionBulletAndPlayers(instanceId, instance, bulletOwnerPlayerId, bulletId, bullet); if (!bullet.isAlive()) continue; -// collisionBulletAndObjects(instance, bulletOwnerPlayerId, bulletId, bullet); + collisionBulletAndObjects(instance, bulletOwnerPlayerId, bulletId, bullet); } } }