diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java index ca3aedb..d8cace9 100644 --- a/src/main/java/cactusServer/models/CollisionManager.java +++ b/src/main/java/cactusServer/models/CollisionManager.java @@ -11,6 +11,7 @@ import cactusServer.entities.Character; import cactusServer.entities.Instance; +import cactusServer.entities.Object; public class CollisionManager { private static CollisionManager theInstance; @@ -33,16 +34,15 @@ return result; } - @SuppressWarnings("unlikely-arg-type") public void collisionRun() { - result.clear(); for (Map.Entry instance : instances.entrySet()) { - HashMap objects = instance.getValue().getObjects(); - HashMap characters = instance.getValue().getCharacters(); - for (Map.Entry object : objects.entrySet()) { + result.clear(); + HashMap objects = instance.getValue().getObjects(); + HashMap characters = instance.getValue().getCharacters(); + for (Map.Entry object : objects.entrySet()) { for (Map.Entry character : characters.entrySet()) { - result.add(PhysicsUtility.checkCollision(, "", - instances.get(i).getObjects().get(j).getObject(), "")); + result.add(PhysicsUtility.checkCollision(character.getValue().getObject(), "", + object.getValue().getObject(), "")); } } } diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 14a14d9..60ec9da 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -40,13 +40,13 @@ Instances.getInstance(); Accounts.getInstance(); initDummy(); - start(1000); + start(1); System.out.println("pass"); } @Override public void run() { - System.out.println("�^�X�N�����s"); + //System.out.println("�^�X�N�����s"); CollisionManager.getCollision().collisionRun(); }