[patch] Power Word: Shield and Divine Aegis stacking

[Auntie Mangos]

What bug does the patch fix? What features does the patch add?

Fix Priest Power Word: Shield and Divine Aegis replacing each other in IsNoStackSpellDueToSpell because of same effect.

Fixed with Spell icon check.

For which repository revision was the patch created?

Should work with latest. Tested and working in 9009.

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

http://getmangos.eu/community/viewtopic.php?id=10276

Who has been writing this patch? Please include either forum user names or email addresses.

Me

Patch

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index bc98152..aacf9ec 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1528,6 +1528,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
                if ((spellInfo_1->Id == 47585 && spellInfo_2->Id == 60069) ||
                    (spellInfo_2->Id == 47585 && spellInfo_1->Id == 60069))
                    return false;
+                // Power Word: Shield and Divine Aegis
+                if ((spellInfo_1->SpellIconID == 566 && spellInfo_2->SpellIconID == 2820) ||
+                    (spellInfo_2->SpellIconID == 566 && spellInfo_1->SpellIconID == 2820))
+                    return false;
            }
            break;
        case SPELLFAMILY_DRUID:

[Forusim]

time for bump