From a5df77a9d6f3e48f2c4e8a61d60e3b5f2f0c326e Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 19 Apr 2018 23:37:41 +0200 Subject: Core/Transports: Force transport passengers into legacy spawn group Ref #21641 --- src/server/scripts/Commands/cs_npc.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (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 1e1dfcf212f..1170a68b3ba 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -355,12 +355,11 @@ public: data.id = id; data.phaseMask = chr->GetPhaseMaskForSpawn(); data.spawnPoint.Relocate(chr->GetTransOffsetX(), chr->GetTransOffsetY(), chr->GetTransOffsetZ(), chr->GetTransOffsetO()); - - Creature* creature = trans->CreateNPCPassenger(guid, &data); - - creature->SaveToDB(trans->GetGOInfo()->moTransport.mapID, 1 << map->GetSpawnMode(), chr->GetPhaseMaskForSpawn()); - - sObjectMgr->AddCreatureToGrid(guid, &data); + if (Creature* creature = trans->CreateNPCPassenger(guid, &data)) + { + creature->SaveToDB(trans->GetGOInfo()->moTransport.mapID, 1 << map->GetSpawnMode(), chr->GetPhaseMaskForSpawn()); + sObjectMgr->AddCreatureToGrid(guid, &data); + } return true; } -- cgit v1.2.3