diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2017-04-27 15:34:01 +0200 |
|---|---|---|
| committer | ccrs <ccrs@users.noreply.github.com> | 2017-04-27 15:34:01 +0200 |
| commit | 229444b74a7e2176db142e0446d4268995c5aad6 (patch) | |
| tree | f5b767f57bf22894af6f471b8626da2a6848ff5f /src/server/scripts/EasternKingdoms | |
| parent | c7a57e2a093ada2ece7a01eac2f627aeb26b08d5 (diff) | |
Core/Misc: cleanup SetInFront uses
Set in front modifies only the serverside orientation, use with care.
Also check for current focus to prevent things like incorrect damage on casting creatures (ie dragon breath direction change in your face because of some taunt missclick)
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
4 files changed, 4 insertions, 5 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 7320a6796ee..3a46d63fe5d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -271,7 +271,7 @@ public: case EVENT_SUCCESS_1: if (Unit* player = me->SelectNearestPlayer(60.0f)) { - me->SetInFront(player); + me->SetFacingToObject(player); Talk(SAY_SUCCESS); if (GameObject* portcullis1 = me->FindNearestGameObject(GO_PORTCULLIS_ACTIVE, 65.0f)) portcullis1->SetGoState(GO_STATE_ACTIVE); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index bde2a220398..79fcb2634b1 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -194,8 +194,8 @@ public: ++IntroPhase; break; case 1: - me->SetInFront(Madrigosa); - Madrigosa->SetInFront(me); + me->SetFacingToObject(Madrigosa); + Madrigosa->SetFacingToObject(me); Madrigosa->AI()->Talk(YELL_MADR_INTRO, me); IntroPhaseTimer = 9000; ++IntroPhase; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 203d1266e6a..3a28a2569d1 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -242,7 +242,6 @@ class boss_akilzon : public CreatureScript { TargetGUID = target->GetGUID(); DoCast(target, SPELL_STATIC_DISRUPTION, false); - me->SetInFront(me->GetVictim()); } /*if (float dist = me->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f) dist = 5.0f; SDisruptAOEVisual_Timer = 1000 + floor(dist / 30 * 1000.0f);*/ diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index d766f3445ec..10d0772932c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -545,7 +545,7 @@ class boss_zuljin : public CreatureScript if (Flame_Breath_Timer <= diff) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - me->SetInFront(target); + me->SetFacingToObject(target); DoCast(me, SPELL_FLAME_BREATH); Flame_Breath_Timer = 10000; } |