sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/Ulduar): Fixed console errors of uninstalling vehicles. (#11334)

Browse Source 
Fixes #11314
This commit is contained in:
UltraNix
2022-04-18 19:37:30 +02:00
committed by GitHub
parent 858c72bda8
commit 519fd3dfd2
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+17 -6
View File
@@ -664,8 +664,12 @@ public:
{ {
Map::PlayerList const& pList = instance->GetPlayers(); Map::PlayerList const& pList = instance->GetPlayers();
for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr) for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
if (Vehicle* veh = itr->GetSource()->GetVehicle()) {
veh->Dismiss(); if (Creature* vehicleCreature = itr->GetSource()->GetVehicleCreatureBase())
{
vehicleCreature->DespawnOrUnsummon();
}
}
} }
break; break;
case TYPE_IGNIS: case TYPE_IGNIS:
@@ -837,8 +841,12 @@ public:
{ {
Map::PlayerList const& pList = instance->GetPlayers(); Map::PlayerList const& pList = instance->GetPlayers();
for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr) for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
if (Vehicle* veh = itr->GetSource()->GetVehicle()) {
veh->Dismiss(); if (Creature* vehicleCreature = itr->GetSource()->GetVehicleCreatureBase())
{
vehicleCreature->DespawnOrUnsummon();
}
}
} }
} }
@@ -1239,9 +1247,12 @@ void instance_ulduar::instance_ulduar_InstanceMapScript::SpawnLeviathanEncounter
if (!_leviathanVehicles.empty()) if (!_leviathanVehicles.empty())
{ {
for (ObjectGuid const& guid : _leviathanVehicles) for (ObjectGuid const& guid : _leviathanVehicles)
{
if (Creature* cr = instance->GetCreature(guid)) if (Creature* cr = instance->GetCreature(guid))
if (Vehicle* veh = cr->GetVehicleKit()) {
veh->Dismiss(); cr->DespawnOrUnsummon();
}
}
_leviathanVehicles.clear(); _leviathanVehicles.clear();
} }