From 4a219eda07c353139608065f7d0a016094ee4ce0 Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 4 Aug 2019 01:26:20 +0200 Subject: Core/Unit: Spell focusing now no longer nonsensical. HasSpellFocus always const. Error logs for various stuff. --- .../Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp | 2 +- .../scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp | 2 +- src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index ce71046433c..243020e4d4c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -1363,7 +1363,7 @@ class npc_the_lich_king_escape_hor : public CreatureScript if (!me->HasReactState(REACT_PASSIVE)) { if (Unit* victim = me->SelectVictim()) - if (!me->HandleSpellFocus(nullptr, true) && victim != me->GetVictim()) + if (!me->HasSpellFocus() && victim != me->GetVictim()) AttackStart(victim); return me->GetVictim() != nullptr; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 2f2793b13bd..c663f696f46 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -630,7 +630,7 @@ protected: if (!me->HasReactState(REACT_PASSIVE)) { if (Unit* victim = me->SelectVictim()) - if (!me->HandleSpellFocus(nullptr, true) && victim != me->GetVictim()) + if (!me->HasSpellFocus() && victim != me->GetVictim()) AttackStart(victim); return me->GetVictim() != nullptr; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 2ddc9af56f3..672fe283892 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -1821,7 +1821,7 @@ class spell_thorim_lightning_charge : public SpellScriptLoader { /// @workaround: focus target is not working because spell is triggered and instant if (Creature* creature = GetCaster()->ToCreature()) - creature->SetSpellFocusTarget(GetSpell(), GetExplTargetWorldObject()); + creature->SetSpellFocus(GetSpell(), GetExplTargetWorldObject()); } void HandleCharge() -- cgit v1.2.3