From 5e741c37364f4ec5e3bc2860bcf21f13812fb66d Mon Sep 17 00:00:00 2001
From: Keleborn <22352763+Celandriel@users.noreply.github.com>
Date: Mon, 30 Mar 2026 11:59:44 -0700
Subject: [PATCH] Merge fix.

---
 src/server/game/Entities/Creature/CreatureData.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h
index a79d7f8f0..616f2db62 100644
--- a/src/server/game/Entities/Creature/CreatureData.h
+++ b/src/server/game/Entities/Creature/CreatureData.h
@@ -369,6 +369,7 @@ typedef std::unordered_map<uint32, EquipmentInfoContainerInternal> EquipmentInfo
 struct CreatureData : public SpawnData
 {
     CreatureData() : SpawnData(SPAWN_TYPE_CREATURE) {}
+    ObjectGuid::LowType spawnId{ 0 };                          // mod_playerbots
     uint32 id1{0};                                             // entry in creature_template
     uint32 id2{0};                                             // entry in creature_template
     uint32 id3{0};                                             // entry in creature_template