aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2018-04-19 23:37:41 +0200
committerShauren <shauren.trinity@gmail.com>2021-09-26 01:42:54 +0200
commit068b340b6988c3edd8db2b9d62a99baebe1b031e (patch)
tree023217434f3b2ac19133d4d11479c5686afa68fa /src/server/scripts
parent5274f7af177b9df1b54febd2ebc144ff06835474 (diff)
Core/Transports: Force transport passengers into legacy spawn group
Ref #21641 (cherry picked from commit a5df77a9d6f3e48f2c4e8a61d60e3b5f2f0c326e)
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 68a7d63ee6a..b235c539e8e 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -385,13 +385,11 @@ public:
data.spawnId = guid;
data.id = id;
data.spawnPoint.Relocate(chr->GetTransOffsetX(), chr->GetTransOffsetY(), chr->GetTransOffsetZ(), chr->GetTransOffsetO());
- /// @todo: add phases
-
- Creature* creature = trans->CreateNPCPassenger(guid, &data);
-
- creature->SaveToDB(trans->GetGOInfo()->moTransport.SpawnMap, { map->GetDifficultyID() });
-
- sObjectMgr->AddCreatureToGrid(guid, &data);
+ if (Creature* creature = trans->CreateNPCPassenger(guid, &data))
+ {
+ creature->SaveToDB(trans->GetGOInfo()->moTransport.SpawnMap, { map->GetDifficultyID() });
+ sObjectMgr->AddCreatureToGrid(guid, &data);
+ }
return true;
}