From db7475f4f5bb5f6460a0c1d559c4084c278e986b Mon Sep 17 00:00:00 2001 From: Dan <83884799+elthehablo@users.noreply.github.com> Date: Sat, 9 Mar 2024 15:08:23 +0100 Subject: [PATCH] fix(Scripts/TheEye): ensure Ember of Al'ar always spawn in the right spot (#18511) init --- .../Outland/TempestKeep/Eye/boss_alar.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index dca10b3f2..1b2fe29e8 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -139,7 +139,7 @@ struct boss_alar : public BossAI if (_noQuillTimes++ > 0) { me->SetOrientation(alarPoints[_platform].GetOrientation()); - SpawnPhoenixes(1, me, false); + SpawnPhoenixes(1, me); } me->GetMotionMaster()->MovePoint(POINT_PLATFORM, alarPoints[_platform], false, true); _platform = (_platform+1)%4; @@ -247,21 +247,14 @@ struct boss_alar : public BossAI ScheduleMainSpellAttack(0s); } - void SpawnPhoenixes(uint8 count, Unit* targetToSpawnAt, bool onPosition) + void SpawnPhoenixes(uint8 count, Unit* targetToSpawnAt) { if (targetToSpawnAt) { + Position spawnPosition = DeterminePhoenixPosition(targetToSpawnAt->GetPosition()); for (uint8 i = 0; i < count; ++i) { - if (onPosition) - { - Position spawnPosition = DeterminePhoenixPosition(targetToSpawnAt->GetPosition()); - me->SummonCreature(NPC_EMBER_OF_ALAR, spawnPosition, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000); - } - else - { - me->SummonCreature(NPC_EMBER_OF_ALAR, *targetToSpawnAt, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000); - } + me->SummonCreature(NPC_EMBER_OF_ALAR, spawnPosition, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000); } } } @@ -273,7 +266,7 @@ struct boss_alar : public BossAI { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true)) { - SpawnPhoenixes(2, target, true); + SpawnPhoenixes(2, target); } }).Schedule(6s, [this](TaskContext) {