From bc57ecd3bddee1c30b5cb9ea912b356150a2bb7e Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 16 May 2020 11:23:34 +0200
Subject: [PATCH] Core/Commands: Fixed .npc add overwriting existing spawns
 when used on transports

---
 src/server/scripts/Commands/cs_npc.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index c496e832d35..e75837a3ab0 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -350,9 +350,10 @@ public:
 
         if (MapTransport* trans = chr->GetMapTransport())
         {
-            ObjectGuid::LowType guid = map->GenerateLowGuid<HighGuid::Unit>();
+            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());