diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 330b75a48..1a46488d4 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4517,13 +4517,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu triggered_spell_id = 25997; break; } - // Sweeping Strikes - case 12328: + // Sweeping Strikes (NPC spells may be) case 18765: case 35429: { // prevent chain of triggered spell from same triggered spell - if(procSpell && procSpell->Id==26654) + if(procSpell && procSpell->Id == 26654) return false; target = SelectNearbyTarget(); @@ -5049,6 +5048,21 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu basepoints0 = GetShieldBlockValue() * triggerAmount / 100; break; } + + // Sweeping Strikes + if (dummySpell->Id == 12328) + { + // prevent chain of triggered spell from same triggered spell + if(procSpell && procSpell->Id == 26654) + return false; + + target = SelectNearbyTarget(); + if(!target) + return false; + + triggered_spell_id = 26654; + break; + } break; } case SPELLFAMILY_WARLOCK: diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a62b7ab7d..edf27fdd1 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 "8247" + #define REVISION_NR "8248" #endif // __REVISION_NR_H__