aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/Unit.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index a0d88f922dc..5c08b728307 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -8089,9 +8089,11 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
InterruptSpell(CURRENT_MELEE_SPELL);
if(!meleeAttack)
clearUnitState(UNIT_STAT_MELEE_ATTACKING);
- m_attacking->_removeAttacker(this);
}
+ if(m_attacking)
+ m_attacking->_removeAttacker(this);
+
m_attacking = victim;
m_attacking->_addAttacker(this);