From 4b6c4033c9a3ec2f2502f67f0ab88769da012e95 Mon Sep 17 00:00:00 2001
From: Ovalord <1Don7H4v3@m41L.com>
Date: Mon, 22 Jan 2018 11:26:53 +0100
Subject: [PATCH] Core/Creatures: tempoarily disable creature replacements
 until it has been ported to a movement generator

---
 src/server/game/AI/CreatureAI.cpp              | 2 +-
 src/server/game/Entities/Creature/Creature.cpp | 2 +-
 src/server/game/Entities/Unit/Unit.cpp         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index f3ee5e7b40..4bf62fd3e4 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -398,7 +398,7 @@ void CreatureAI::CheckRepositionRequirements()
         victimPos.Relocate(victim->GetPosition());
 
         // If we are closer than  50% of the combat reach we are going to reposition ourself
-        if (me->GetDistance(victimPos) < CalculatePct(me->GetCombatReach(), 50))
+        if ((me->GetExactDist(victimPos) - me->GetCombatReach()) < CalculatePct(me->GetCombatReach(), 50))
             me->MoveAdvanceTo(victim);
     }
 }
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index a4926b8d01..d674e816a2 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -632,7 +632,7 @@ void Creature::Update(uint32 diff)
 
                 if (diff >= m_advanceMovementTime)
                 {
-                    AI()->CheckRepositionRequirements();
+                    // AI()->CheckRepositionRequirements();
                     m_advanceMovementTime = 3000;
                 }
                 else
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index c9885b1c41..b5e8f3143b 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -500,8 +500,8 @@ void Unit::MoveAdvanceTo(Unit* target)
     Movement::MoveSplineInit init(this);
     init.MoveTo(x, y, z, true, false);
 
-    // Beasts move backwards instead of turning arround
-    if (ToCreature() && ToCreature()->GetCreatureTemplate()->type == CREATURE_TYPE_BEAST)
+    // Creatures except humanoids move backwards instead of turning arround
+    if (ToCreature() && ToCreature()->GetCreatureTemplate()->type != CREATURE_TYPE_HUMANOID)
         init.SetOrientationFixed(true);
 
     init.Launch();