*Do not let Steady shot pause autoshot timer.

--HG--
branch : trunk
This commit is contained in:
megamage committed 2008-11-25 17:58:06 -06:00
1 parent f6ea784eda
commit 99cf79bdf7
7 files changed
+16 -14

No files matched your search

+2 -3
View File
@@ -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