diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java index 790b036..44c9d3c 100644 --- a/src/main/java/cactusServer/models/CollisionManager.java +++ b/src/main/java/cactusServer/models/CollisionManager.java @@ -10,23 +10,25 @@ import cactusServer.entities.Instance; import cactusServer.entities.Object; import cactusServer.entities.Player; +import net.arnx.jsonic.JSONHint; public class CollisionManager { private static CollisionManager theInstance; private HashMap instances; - private ArrayList resultList; + private ArrayList resultList = new ArrayList(); private CollisionManager() { instances = Instances.getInstance().getInstances(); } - public static CollisionManager getCollision() { + public static CollisionManager getInstance() { if (theInstance == null) { theInstance = new CollisionManager(); } return theInstance; } - + + @JSONHint(ignore = true) public ArrayList getResultList() { return resultList; } diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index f2b4b09..86717fc 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -40,7 +40,7 @@ public App() { int interval; - if(debugflag == true) { + if(debugflag) { interval = 1000; }else { interval = 1; @@ -51,6 +51,7 @@ BulletModelManager.getInstance(); Instances.getInstance(); Accounts.getInstance(); + CollisionManager.getInstance(); initDummy(); start(interval); System.out.println("pass"); @@ -59,7 +60,7 @@ @Override public void run() { // System.out.println("�^�X�N�����s"); - CollisionManager.getCollision().collisionRun(System.nanoTime() - lasttime); + CollisionManager.getInstance().collisionRun(System.nanoTime() - lasttime); removeInactivePlayers(); lasttime = System.nanoTime(); }