From 04af12e82a98e5e4a9f0354970b22c72426aa393 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Mon, 29 Dec 2008 23:24:34 +0300 Subject: [PATCH] [6978] Allow crashing blow only from auto-attack. Signed-off-by: Machiavelli Thanks to Dreamer for patch preparing for mangos. Signed-off-by: VladimirMangos --- src/game/Unit.cpp | 3 ++- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 68fd00229..c6eeaed54 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -2048,7 +2048,8 @@ 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 crashing 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 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ceeadb6e7..7ad12b6ee 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6977" + #define REVISION_NR "6978" #endif // __REVISION_NR_H__