Browse Source

Harden against null

combat-2
MagicBot 1 year ago
parent
commit
e73b8d2826
  1. 6
      src/engine/gameManager/BuildingManager.java

6
src/engine/gameManager/BuildingManager.java

@ -343,7 +343,8 @@ public enum BuildingManager {
Mob hirelingMob = (Mob) hireling; Mob hirelingMob = (Mob) hireling;
if (hirelingMob.getParentZone() != null) if (hirelingMob.getParentZone() != null)
hirelingMob.getParentZone().zoneMobSet.remove(hireling); if (hirelingMob.getParentZone().zoneMobSet.contains(hirelingMob))
hirelingMob.getParentZone().zoneMobSet.remove(hireling);
} }
@ -352,7 +353,8 @@ public enum BuildingManager {
NPC hirelingNPC = (NPC) hireling; NPC hirelingNPC = (NPC) hireling;
if (hirelingNPC.getParentZone() != null) if (hirelingNPC.getParentZone() != null)
hirelingNPC.getParentZone().zoneNPCSet.remove(hireling); if (hirelingNPC.getParentZone().zoneNPCSet.contains(hirelingNPC))
hirelingNPC.getParentZone().zoneNPCSet.remove(hireling);
} }

Loading…
Cancel
Save