[CORE] reverts

molecula112 · Jul 17, 2023 · 860a72d · 860a72d
1 parent 720ae94
commit 860a72d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/src/game/MotionGenerators/TargetedMovementGenerator.cpp b/src/game/MotionGenerators/TargetedMovementGenerator.cpp
@@ -131,18 +131,11 @@ bool TargetedMovementGeneratorMedium<T, D>::Update(T& owner, const uint32& time_
     }
 
     // prevent movement while casting spells with cast time or channel time
-    if (owner.IsNonMeleeSpellCasted(false, false, true, true))
+    if (owner.IsNonMeleeSpellCasted(false, false,  true))
     {
-        if (!owner.movespline->Finalized())
+        if (!owner.IsStopped())
         {
-            if (owner.IsClientControlled())
-            {
-                owner.StopMoving(true);
-            }
-            else
-            {
-                owner.InterruptMoving();
-            }
+            owner.StopMoving();
         }
         return true;
     }

diff --git a/src/game/Object/Creature.cpp b/src/game/Object/Creature.cpp
@@ -3305,7 +3305,7 @@ SpellCastResult Creature::TryToCast(Unit* pTarget, const SpellEntry* pSpellInfo,
         return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
     }
 
-    if (hasUnitState(UNIT_STAT_STUNNED)) {
+    if (hasUnitState(UNIT_STAT_STUNNED) || IsFeared() || IsPolymorphed() || IsCharmed()) {
         return SPELL_FAILED_STUNNED;
     }
 

diff --git a/src/game/Object/Object.cpp b/src/game/Object/Object.cpp
@@ -272,8 +272,8 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint8 updateFlags) const
         MANGOS_ASSERT(unit);
         if (unit->IsStopped() && unit->m_movementInfo.HasMovementFlag(MOVEFLAG_SPLINE_ENABLED))
         {
-            sLog.outError("%s is not moving but have spline movement enabled!", GetGuidStr().c_str());
-            ((Unit*)this)->m_movementInfo.RemoveMovementFlag(MovementFlags(MOVEFLAG_SPLINE_ENABLED | MOVEFLAG_FORWARD));
+            //sLog.outError("%s is not moving but have spline movement enabled!", GetGuidStr().c_str());
+            //((Unit*)this)->m_movementInfo.RemoveMovementFlag(MovementFlags(MOVEFLAG_SPLINE_ENABLED | MOVEFLAG_FORWARD));
         }
 
         *data << unit->m_movementInfo;