coldsore/Server
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Harden against null

Browse Source
This commit is contained in:
MagicBot
2023-09-09 10:20:20 -04:00
parent ea23003807
commit e73b8d2826
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/BuildingManager.java
+2
View File
@@ -343,6 +343,7 @@ public enum BuildingManager {
Mob hirelingMob = (Mob) hireling; Mob hirelingMob = (Mob) hireling;
if (hirelingMob.getParentZone() != null) if (hirelingMob.getParentZone() != null)
if (hirelingMob.getParentZone().zoneMobSet.contains(hirelingMob))
hirelingMob.getParentZone().zoneMobSet.remove(hireling); hirelingMob.getParentZone().zoneMobSet.remove(hireling);
} }
@@ -352,6 +353,7 @@ public enum BuildingManager {
NPC hirelingNPC = (NPC) hireling; NPC hirelingNPC = (NPC) hireling;
if (hirelingNPC.getParentZone() != null) if (hirelingNPC.getParentZone() != null)
if (hirelingNPC.getParentZone().zoneNPCSet.contains(hirelingNPC))
hirelingNPC.getParentZone().zoneNPCSet.remove(hireling); hirelingNPC.getParentZone().zoneNPCSet.remove(hireling);
} }