aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBlaymoira <none@none>2008-12-25 21:30:32 +0100
committerBlaymoira <none@none>2008-12-25 21:30:32 +0100
commit898d64dcca411fbcb823f0fcb1d36804e9afc2c3 (patch)
tree076262cdc6f3b53dde3e2ee77fb1c41d4b071bee /src
parent3915777c719f53de87d5bf0a7386f46d415187b3 (diff)
*Prevent creature's spells from crushing - by Machiavelli
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Unit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 86d1d23be75..a9c822bddec 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -2947,7 +2947,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
}
}
- if(GetTypeId()!=TYPEID_PLAYER && !(((Creature*)this)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_CRUSH) && !((Creature*)this)->isPet() )
+ if(GetTypeId()!=TYPEID_PLAYER && !(((Creature*)this)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_CRUSH) && !((Creature*)this)->isPet() && !SpellCasted /*Only autoattack can be crushing blow*/ )
{
// mobs can score crushing blows if they're 3 or more levels above victim
// or when their weapon skill is 15 or more above victim's defense skill