diff options
| author | kvipka <qvipka@gmail.com> | 2020-08-28 20:48:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 19:48:41 +0200 |
| commit | 5d2780c43c36b0ae1cc4ac2694bf6ec464d079c7 (patch) | |
| tree | aa5e5e3c597099145bbf6a01f89e583217cb297f /src/server/scripts | |
| parent | b63f5b0d83174abfb1b74111514ec424f5efe748 (diff) | |
Scripts/InstanceScript: Fix an issue where LoadAllGrids would load creatures before TeamInInstance was properly set (PR #25340)
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 652b7e1b50f..92276664805 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -145,7 +145,7 @@ class instance_icecrown_citadel : public InstanceMapScript SetBossNumber(EncounterCount); LoadBossBoundaries(boundaries); LoadDoorData(doorData); - TeamInInstance = 0; + TeamInInstance = map->GetTeamInInstance(); HeroicAttempts = MaxHeroicAttempts; ColdflameJetsState = NOT_STARTED; UpperSpireTeleporterActiveState = NOT_STARTED; @@ -186,9 +186,6 @@ class instance_icecrown_citadel : public InstanceMapScript void OnPlayerEnter(Player* player) override { - if (!TeamInInstance) - TeamInInstance = player->GetTeam(); - uint8 spawnGroupId = TeamInInstance == ALLIANCE ? SPAWN_GROUP_ALLIANCE_ROS : SPAWN_GROUP_HORDE_ROS; if (!instance->IsSpawnGroupActive(spawnGroupId)) instance->SpawnGroupSpawn(spawnGroupId); @@ -332,14 +329,6 @@ class instance_icecrown_citadel : public InstanceMapScript // Weekly quest spawn prevention uint32 GetCreatureEntry(ObjectGuid::LowType /*guidLow*/, CreatureData const* data) override { - if (!TeamInInstance) - { - Map::PlayerList const& players = instance->GetPlayers(); - if (!players.isEmpty()) - if (Player* player = players.begin()->GetSource()) - TeamInInstance = player->GetTeam(); - } - uint32 entry = data->id; switch (entry) { @@ -1528,7 +1517,7 @@ class instance_icecrown_citadel : public InstanceMapScript ObjectGuid FrozenBolvarGUID; ObjectGuid PillarsChainedGUID; ObjectGuid PillarsUnchainedGUID; - uint32 TeamInInstance; + Team TeamInInstance; uint32 ColdflameJetsState; uint32 UpperSpireTeleporterActiveState; std::unordered_set<uint32> FrostwyrmGUIDs; |