diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-21 21:57:09 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-21 21:58:30 +0100 |
| commit | 3f99890b129c836cd364169ec4d69620bff0ca82 (patch) | |
| tree | c71f17ba9f1425ec1044b6dfec60c4e8aa2902a8 /src/server/scripts/Spells | |
| parent | 7c4a16e6c2f9cd6faa4d66ade9fa017267310632 (diff) | |
| parent | 101ac7f5110030ac12fa13f3e9a9d2c671e48734 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 5b08e28e331..a844a4d7e69 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -639,7 +639,7 @@ class spell_warr_retaliation : public SpellScriptLoader bool CheckProc(ProcEventInfo& eventInfo) { // check attack comes not from behind - return GetTarget()->isInFront(eventInfo.GetProcTarget(), M_PI); + return GetTarget()->isInFront(eventInfo.GetProcTarget(), M_PI) && !GetTarget()->HasUnitState(UNIT_STATE_STUNNED); } void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) |