From 104e745edfb89f95e34cad7840eae0b6e183bf94 Mon Sep 17 00:00:00 2001
From: ccrs <ccrs@users.noreply.github.com>
Date: Thu, 27 Apr 2017 15:34:01 +0200
Subject: 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)

(cherry picked from commit 229444b74a7e2176db142e0446d4268995c5aad6)
---
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp | 4 ++--
 src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp                  | 4 ++--
 src/server/scripts/Northrend/zone_zuldrak.cpp                        | 4 ++--
 src/server/scripts/Outland/zone_terokkar_forest.cpp                  | 2 +-
 src/server/scripts/World/npcs_special.cpp                            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/server/scripts')

diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
index 5d760eecbbc..23f9d315457 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -196,8 +196,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/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index 029ea6ad9ce..d7bc3bd5240 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -532,8 +532,8 @@ public:
                     return 1000;
                 case 2:
                     Talk(GEEZLE_SAY_1, Spark);
-                    Spark->SetInFront(me);
-                    me->SetInFront(Spark);
+                    Spark->SetFacingToObject(me);
+                    me->SetFacingToObject(Spark);
                     return 5000;
                 case 3:
                     Spark->AI()->Talk(SPARK_SAY_2);
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index 0e42a431d93..23716389e7e 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -70,8 +70,8 @@ public:
         void LockRageclaw(Creature* rageclaw)
         {
             // pointer check not needed
-            me->SetInFront(rageclaw);
-            rageclaw->SetInFront(me);
+            me->SetFacingToObject(rageclaw);
+            rageclaw->SetFacingToObject(me);
 
             DoCast(rageclaw, SPELL_LEFT_CHAIN, true);
             DoCast(rageclaw, SPELL_RIGHT_CHAIN, true);
diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
index 2e604b4291f..bf595557c49 100644
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -469,7 +469,7 @@ public:
                         player->GroupEventHappens(ESCAPE_FROM_FIREWING_POINT_A, me);
                     else if (player->GetTeam() == HORDE)
                         player->GroupEventHappens(ESCAPE_FROM_FIREWING_POINT_H, me);
-                    me->SetInFront(player);
+                    me->SetFacingToObject(player);
                     break;
                 case 30:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE);
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 671a03918ca..a5d11011ea1 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -420,7 +420,7 @@ public:
         {
             if (me->IsWithinLOS(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()) && me->IsWithinDistInMap(player, 30.0f))
             {
-                me->SetInFront(player);
+                me->SetFacingToObject(player);
                 Active = false;
 
                 switch (emote)
-- 
cgit v1.2.3