Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow to proc spells if they can't stack with already active auras.

Browse Source 
this fixes 13048 and 12292.

--HG--
branch : trunk
This commit is contained in:
krz
2009-05-14 14:35:09 +02:00
parent bfaaa8201e
commit ee40287ef7
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/game/SpellMgr.cpp
View File

@@ -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