diff --git a/gameserver/src/main/java/brainwine/gameserver/entity/npc/Npc.java b/gameserver/src/main/java/brainwine/gameserver/entity/npc/Npc.java index ff806ec..c7c9335 100644 --- a/gameserver/src/main/java/brainwine/gameserver/entity/npc/Npc.java +++ b/gameserver/src/main/java/brainwine/gameserver/entity/npc/Npc.java @@ -250,7 +250,7 @@ public class Npc extends Entity { return (includeBaseDefense ? getBaseDefense(type) : 0) + activeDefenses.getOrDefault(type, 0F); } - public boolean isClearable() { + public boolean isTransient() { return !isGuard(); } diff --git a/gameserver/src/main/java/brainwine/gameserver/zone/EntityManager.java b/gameserver/src/main/java/brainwine/gameserver/zone/EntityManager.java index b970c0c..142542e 100644 --- a/gameserver/src/main/java/brainwine/gameserver/zone/EntityManager.java +++ b/gameserver/src/main/java/brainwine/gameserver/zone/EntityManager.java @@ -162,7 +162,7 @@ public class EntityManager { for(Npc npc : npcs.values()) { if(npc.isDead() || !zone.isChunkLoaded((int)npc.getX(), (int)npc.getY()) || - (!npc.isGuard() && System.currentTimeMillis() > npc.getLastTrackedAt() + ENTITY_CLEAR_TIME)) { + (!npc.isTransient() && System.currentTimeMillis() > npc.getLastTrackedAt() + ENTITY_CLEAR_TIME)) { clearableEntities.add(npc); } } @@ -258,7 +258,7 @@ public class EntityManager { } public int getTransientNpcCount() { - return (int)(getNpcCount() - getNpcs().stream().filter(npc -> npc.isGuard()).count()); + return (int)npcs.values().stream().filter(npc -> npc.isTransient()).count(); } public Collection getNpcs() {