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