diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-03-24 14:39:29 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2024-03-28 20:23:12 +0100 |
| commit | 18b7199a47ee1ebc767c631f2c91c8e1f680d39c (patch) | |
| tree | 8ca9a4621e5f0a8568faa8859b2718f694cf7c0e /src/server/scripts/Outland | |
| parent | 98cb0b4eaf7b66ae797dfb3c92c586adbc3ced6c (diff) | |
Core/Players: Slightly improve neutral player faction support
(cherry picked from commit 94b78ebc8b0eb09409d0db36bebfde85a1644fe8)
Diffstat (limited to 'src/server/scripts/Outland')
| -rw-r--r-- | src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 5dbf231406a..179370727ca 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -66,16 +66,12 @@ class instance_shattered_halls : public InstanceMapScript LoadDungeonEncounterData(encounters); executionTimer = 0; executed = 0; - _team = 0; } void OnPlayerEnter(Player* player) override { Aura* ex = nullptr; - if (!_team) - _team = player->GetTeam(); - player->CastSpell(player, SPELL_REMOVE_KARGATH_EXECUTIONER, true); if (!executionTimer || executionerGUID.IsEmpty()) @@ -102,14 +98,6 @@ class instance_shattered_halls : public InstanceMapScript void OnCreatureCreate(Creature* creature) override { - if (!_team) - { - Map::PlayerList const& players = instance->GetPlayers(); - if (!players.isEmpty()) - if (Player* player = players.begin()->GetSource()) - _team = player->GetTeam(); - } - switch (creature->GetEntry()) { case NPC_GRAND_WARLOCK_NETHEKURSE: @@ -119,7 +107,7 @@ class instance_shattered_halls : public InstanceMapScript kargathGUID = creature->GetGUID(); break; case NPC_RANDY_WHIZZLESPROCKET: - if (_team == HORDE) + if (instance->GetTeamInInstance() == HORDE) creature->UpdateEntry(NPC_DRISELLA); break; case NPC_SHATTERED_EXECUTIONER: @@ -205,7 +193,7 @@ class instance_shattered_halls : public InstanceMapScript case DATA_PRISONERS_EXECUTED: return executed; case DATA_TEAM_IN_INSTANCE: - return _team; + return instance->GetTeamInInstance(); default: return 0; } @@ -249,7 +237,6 @@ class instance_shattered_halls : public InstanceMapScript uint8 executed; uint32 executionTimer; - uint32 _team; }; }; |