1 files changed, 4 insertions, 4 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index c3b5a4a8f3e..a0d88f922dc 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -8086,12 +8086,15 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
         }
 
         //switch target
-        m_attacking->_removeAttacker(this);
         InterruptSpell(CURRENT_MELEE_SPELL);
         if(!meleeAttack)
             clearUnitState(UNIT_STAT_MELEE_ATTACKING);
+        m_attacking->_removeAttacker(this);
     }
 
+    m_attacking = victim;
+    m_attacking->_addAttacker(this);
+
     //Set our target
     SetUInt64Value(UNIT_FIELD_TARGET, victim->GetGUID());
 
@@ -8102,9 +8105,6 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
     //if(GetTypeId()==TYPEID_UNIT)
     //    ((Creature*)this)->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ());
 
-    m_attacking = victim;
-    m_attacking->_addAttacker(this);
-
     //if(m_attacking->GetTypeId()==TYPEID_UNIT && ((Creature*)m_attacking)->IsAIEnabled)
     //    ((Creature*)m_attacking)->AI()->AttackedBy(this);