[12626] Improve "NPCs gets stuck in melee animation while casting".

Fix cmangos/issues#379
cmangos · Apr 7, 2014 · ff4734d · ff4734d
1 parent 218db48
commit ff4734d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp
@@ -728,7 +728,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
             break;
         case ACTION_T_COMBAT_MOVEMENT:
             // ignore no affect case
-            if (m_isCombatMovement == (action.combat_movement.state != 0))
+            if (m_isCombatMovement == (action.combat_movement.state != 0) || m_creature->IsNonMeleeSpellCasted(false))
                 return;
 
             SetCombatMovement(action.combat_movement.state != 0, true);

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12625"
+ #define REVISION_NR "12626"
 #endif // __REVISION_NR_H__