diff --git a/src/engine/db/handlers/dbHandlerBase.java b/src/engine/db/handlers/dbHandlerBase.java index 783a8432..cb0fdd43 100644 --- a/src/engine/db/handlers/dbHandlerBase.java +++ b/src/engine/db/handlers/dbHandlerBase.java @@ -62,6 +62,9 @@ public abstract class dbHandlerBase { } else { AbstractGameObject toAdd = localClass.getConstructor(ResultSet.class).newInstance(rs); DbManager.addToCache(toAdd); + if(toAdd.getObjectType().equals(GameObjectType.Zone) && rs.getInt("canLoad") == 0){ + continue; + } objectList.add((T) toAdd); if (toAdd != null && toAdd instanceof AbstractWorldObject) diff --git a/src/engine/objects/Zone.java b/src/engine/objects/Zone.java index 0971212f..ada99263 100644 --- a/src/engine/objects/Zone.java +++ b/src/engine/objects/Zone.java @@ -61,7 +61,6 @@ public class Zone extends AbstractGameObject { //public static ArrayList respawnQue = new ArrayList<>(); public static final Set respawnQue = Collections.newSetFromMap(new ConcurrentHashMap<>()); public static long lastRespawn = 0; - public int canLoad; /** * ResultSet Constructor */ @@ -102,8 +101,6 @@ public class Zone extends AbstractGameObject { if (hash == null) setHash(); - this.canLoad = rs.getInt("canLoad"); - } public static void serializeForClientMsg(Zone zone, ByteBufferWriter writer) { diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java index fffd617c..85089efb 100644 --- a/src/engine/server/world/WorldServer.java +++ b/src/engine/server/world/WorldServer.java @@ -568,9 +568,6 @@ public class WorldServer { for (Zone zone : rootParent) { - if(zone.canLoad == 0) - continue; - try { ZoneManager.addZone(zone.getLoadNum(), zone);