aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellMgr.cpp
diff options
context:
space:
mode:
authorkrz <none@none>2009-05-14 14:35:09 +0200
committerkrz <none@none>2009-05-14 14:35:09 +0200
commitee40287ef72ec00d3ede4abe5ad5aa68ac6cd7af (patch)
treeabdb71aee4affbc0bdb4b212f5f0a646fa95e6ca /src/game/SpellMgr.cpp
parentbfaaa8201e6887fedd2145d668f40a484a609dac (diff)
Do not allow to proc spells if they can't stack with already active auras.
this fixes 13048 and 12292. --HG-- branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
-rw-r--r--src/game/SpellMgr.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 54911ff4451..48bae52983c 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -345,6 +345,19 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
else if((spellInfo->AttributesEx2 & SPELL_ATTR_EX2_FOOD)
&& !spellInfo->Category)
return SPELL_WELL_FED;
+
+ switch(spellInfo->Id)
+ {
+ case 12880: // warrior's Enrage rank 1
+ case 14201: // Enrage rank 2
+ case 14202: // Enrage rank 3
+ case 14203: // Enrage rank 4
+ case 14204: // Enrage rank 5
+ case 12292: // Death Wish
+ return SPELL_WARRIOR_ENRAGE;
+ break;
+ default: break;
+ }
break;
}
case SPELLFAMILY_MAGE:
@@ -489,6 +502,7 @@ bool IsSingleFromSpellSpecificPerTarget(uint32 spellSpec1,uint32 spellSpec2)
case SPELL_DRINK:
case SPELL_FOOD:
case SPELL_CHARM:
+ case SPELL_WARRIOR_ENRAGE:
return spellSpec1==spellSpec2;
case SPELL_BATTLE_ELIXIR:
return spellSpec2==SPELL_BATTLE_ELIXIR