From ee40287ef72ec00d3ede4abe5ad5aa68ac6cd7af Mon Sep 17 00:00:00 2001
From: krz <none@none>
Date: Thu, 14 May 2009 14:35:09 +0200
Subject: Do not allow to proc spells if they can't stack with already active
 auras. this fixes 13048 and 12292.

--HG--
branch : trunk
---
 src/game/SpellMgr.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src/game/SpellMgr.cpp')

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
-- 
cgit v1.2.3