josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Merge. Sorry for the mess. But a rev was wrongly backouted so we have to make these two backouts.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-14 11:47:12 -05:00
parent 64bee88f69 22b082519e
commit 657971629c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.cpp
+4 -4
View File
@@ -2767,9 +2767,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
{ {
WeaponAttackType attType = BASE_ATTACK; WeaponAttackType attType = BASE_ATTACK;
// Check damage class instead of attack type to correctly handle judgements if (spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED && IsRangedWeaponSpell(spell))
// - they are meele, but can't be dodged/parried/deflected because of ranged dmg class
if (spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED)
attType = RANGED_ATTACK; attType = RANGED_ATTACK;
// bonus from skills is 0.04% per skill Diff // bonus from skills is 0.04% per skill Diff
@@ -2811,7 +2809,9 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
return SPELL_MISS_NONE; return SPELL_MISS_NONE;
// Ranged attack cannot be parry/dodge only deflect // Ranged attack cannot be parry/dodge only deflect
if (attType == RANGED_ATTACK) // Check damage class instead of attack type to correctly handle judgements
// - they are meele, but can't be dodged/parried/deflected because of ranged dmg class
if (spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED)
{ {
// only if in front // only if in front
if (pVictim->HasInArc(M_PI,this)) if (pVictim->HasInArc(M_PI,this))