From 138612bc881383032809cb9972650c8249e15542 Mon Sep 17 00:00:00 2001
From: JJ <3617814+joligario@users.noreply.github.com>
Date: Fri, 2 May 2025 16:25:18 -0400
Subject: [PATCH] Only resume NPC if npc_id is ready (#4875)

---
 zone/zone_save_state.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zone/zone_save_state.cpp b/zone/zone_save_state.cpp
index 3401bc5e0..187d94d00 100644
--- a/zone/zone_save_state.cpp
+++ b/zone/zone_save_state.cpp
@@ -517,7 +517,7 @@ bool Zone::LoadZoneState(
 
 		new_spawn->SetStoredLocation(glm::vec4(s.x, s.y, s.z, s.heading));
 
-		if (spawn_time_left == 0) {
+		if (spawn_time_left == 0 && s.npc_id > 0) {
 			new_spawn->SetResumedNPCID(s.npc_id);
 			new_spawn->SetResumedFromZoneSuspend(true);
 			new_spawn->SetEntityVariables(GetVariablesDeserialized(s.entity_variables));