From 98272944eef1d710665223df4e16978876e8f9f3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 16 May 2020 11:23:34 +0200 Subject: Core/Commands: Fixed .npc add overwriting existing spawns when used on transports (cherry picked from commit 75ab3619bdec058dcc848ad134c6d5e838e8f6fb) --- src/server/scripts/Commands/cs_npc.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 2c32d1b6687..68f4cb2cdc1 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -217,9 +217,10 @@ public: if (Transport* trans = chr->GetTransport()) { - ObjectGuid::LowType guid = map->GenerateLowGuid(); + ObjectGuid::LowType guid = sObjectMgr->GenerateCreatureSpawnId(); CreatureData& data = sObjectMgr->NewOrExistCreatureData(guid); data.spawnId = guid; + data.spawnGroupData = sObjectMgr->GetDefaultSpawnGroup(); data.id = id; data.spawnPoint.Relocate(chr->GetTransOffsetX(), chr->GetTransOffsetY(), chr->GetTransOffsetZ(), chr->GetTransOffsetO()); if (Creature* creature = trans->CreateNPCPassenger(guid, &data)) -- cgit v1.2.3