From b0dd7e9b592af539f354d80ee71af0f2bb95a29d Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Tue, 18 Feb 2025 21:37:43 -0600
Subject: [PATCH] bug fix

---
 src/engine/objects/NPC.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java
index be456d93..7f09fdc6 100644
--- a/src/engine/objects/NPC.java
+++ b/src/engine/objects/NPC.java
@@ -876,9 +876,10 @@ public class NPC extends AbstractCharacter {
         // zone collection
 
         this.parentZone = ZoneManager.getZoneByUUID(this.parentZoneUUID);
-        this.parentZone.zoneNPCSet.remove(this);
-        this.parentZone.zoneNPCSet.add(this);
-
+        if(this.parentZone != null) {
+            this.parentZone.zoneNPCSet.remove(this);
+            this.parentZone.zoneNPCSet.add(this);
+        }
         // Setup location for this NPC
 
         this.bindLoc = new Vector3fImmutable(this.statLat, this.statAlt, this.statLon);