aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2020-05-16 11:23:34 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-04 15:33:04 +0100
commit98272944eef1d710665223df4e16978876e8f9f3 (patch)
tree30150828643a1a425289c516019b0c7ffde8f822 /src
parent9cb01a79046fce3f76835bb68bf66e4f3079e4bc (diff)
Core/Commands: Fixed .npc add overwriting existing spawns when used on transports
(cherry picked from commit 75ab3619bdec058dcc848ad134c6d5e838e8f6fb)
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp3
1 files changed, 2 insertions, 1 deletions
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<HighGuid::Creature>();
+ 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))