Revert "Remove respective incapacitate states on movegen finalize"

Incorrect usage, these are spell handlers only, this completely breaks CC spells overlapping.
cmangos · Nov 2, 2017 · 85acd4b · 85acd4b
1 parent dda0a6f
commit 85acd4b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/game/MotionGenerators/ConfusedMovementGenerator.cpp b/src/game/MotionGenerators/ConfusedMovementGenerator.cpp
@@ -106,15 +106,13 @@ template<>
 void ConfusedMovementGenerator<Player>::Finalize(Player& unit) const
 {
     unit.clearUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_CONFUSED_MOVE);
-    unit.SetConfused(false);
     unit.StopMoving(true);
 }
 
 template<>
 void ConfusedMovementGenerator<Creature>::Finalize(Creature& unit) const
 {
     unit.clearUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_CONFUSED_MOVE);
-    unit.SetConfused(false);
 }
 
 template void ConfusedMovementGenerator<Player>::Initialize(Player& player);

diff --git a/src/game/MotionGenerators/FleeingMovementGenerator.cpp b/src/game/MotionGenerators/FleeingMovementGenerator.cpp
@@ -145,7 +145,6 @@ template<>
 void FleeingMovementGenerator<Creature>::Finalize(Creature& owner) const
 {
     owner.clearUnitState(UNIT_STAT_FLEEING | UNIT_STAT_FLEEING_MOVE);
-    owner.SetFeared(false);
 }
 
 template<class T>
@@ -197,7 +196,7 @@ template bool FleeingMovementGenerator<Creature>::Update(Creature&, const uint32
 
 void TimedFleeingMovementGenerator::Finalize(Unit& owner)
 {
-    FleeingMovementGenerator<Creature>::Finalize((Creature&)owner);
+    owner.clearUnitState(UNIT_STAT_FLEEING | UNIT_STAT_FLEEING_MOVE);
     if (Unit* victim = owner.getVictim())
     {
         if (owner.isAlive())