From d452a73a449010e03157f0f58322eaa4221e5756 Mon Sep 17 00:00:00 2001 From: zerg Date: Wed, 30 Jun 2010 22:28:35 +0400 Subject: [PATCH] [10130] Proper stacking 30108/348 anr ranks from 3.2.x (based on zergtmn's repo commit 7588ca9) Signed-off-by: VladimirMangos --- src/game/SpellMgr.cpp | 4 ++++ src/game/SpellMgr.h | 1 + src/shared/revision_nr.h | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 008c21cde..7eee55e3c 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -398,6 +398,9 @@ SpellSpecific GetSpellSpecific(uint32 spellId) if (spellInfo->SpellFamilyFlags & UI64LIT(0x2000002000000000) || spellInfo->SpellFamilyFlags2 & 0x00000010) return SPELL_WARLOCK_ARMOR; + // Unstable Affliction | Immolate + if (spellInfo->SpellFamilyFlags & UI64LIT(0x10000000004)) + return SPELL_UA_IMMOLATE; break; } case SPELLFAMILY_PRIEST: @@ -484,6 +487,7 @@ bool IsSingleFromSpellSpecificPerTargetPerCaster(SpellSpecific spellSpec1,SpellS case SPELL_POSITIVE_SHOUT: case SPELL_JUDGEMENT: case SPELL_HAND: + case SPELL_UA_IMMOLATE: return spellSpec1==spellSpec2; default: return false; diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 6c5b5508a..88fc5ab75 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -103,6 +103,7 @@ enum SpellSpecific SPELL_FOOD = 20, SPELL_DRINK = 21, SPELL_FOOD_AND_DRINK = 22, + SPELL_UA_IMMOLATE = 23, // Unstable Affliction and Immolate }; SpellSpecific GetSpellSpecific(uint32 spellId); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 66b9ae9cb..6fa60f7e2 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 "10129" + #define REVISION_NR "10130" #endif // __REVISION_NR_H__ -- 2.11.4.GIT