diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 1b19142e366..79267c94bfc 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -4935,6 +4935,9 @@ bool Unit::HandleAuraProcOnPowerAmount(Unit* victim, uint32 /*damage*/, AuraEffe { case 0: { + if (HasAura(trigger_spell_id)) + return false; + // Do not proc if proc spell isnt starfire and starsurge if (procSpell->Id != 2912 && procSpell->Id != 78674) return false; @@ -4948,6 +4951,9 @@ bool Unit::HandleAuraProcOnPowerAmount(Unit* victim, uint32 /*damage*/, AuraEffe } case 1: { + if (HasAura(trigger_spell_id)) + return false; + // Do not proc if proc spell isnt wrath and starsurge if (procSpell->Id != 5176 && procSpell->Id != 78674) return false; diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 8adf1ce68ad..d44845a389e 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1158,6 +1158,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const break; case FORM_MOONKIN: spellId = 24905; + spellId2 = 24907; break; case FORM_FLIGHT: spellId = 33948; |