aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 6e51e368281..307dc6c7407 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1048,10 +1048,9 @@ void Player::Update( uint32 p_time )
}
}
- if (hasUnitState(UNIT_STAT_MELEE_ATTACKING))
+ if (hasUnitState(UNIT_STAT_MELEE_ATTACKING) && !hasUnitState(UNIT_STAT_CASTING))
{
- Unit *pVictim = getVictim();
- if( !IsNonMeleeSpellCasted(false) && pVictim)
+ if(Unit *pVictim = getVictim())
{
// default combat reach 10
// TODO add weapon,skill check