[patch][5821] Seal Of Command And Band Of Eternal Chamion Bonus Overwrite Each Other

[Ultron]

What bug does the patch fix?

Paladin's seal Seal of Command and on hit bonus from ring Band of Eternal Champion overwrite each other, as have identical SpellIconId.

For which SubVersion revision was the patch created?

5790

Who has been writing this patch?

Ultron

Index: SpellMgr.cpp
===================================================================
--- SpellMgr.cpp        (revision 5790)
+++ SpellMgr.cpp        (working copy)
@@ -950,6 +950,10 @@

        if(spellInfo_1->Id == spellId_2)
                return false;
+        
+        //Seal of Command and Band of Eternal Champion
+        if ((spellInfo_1->SpellFamilyName == SPELLFAMILY_PALADIN || spellInfo_2->SpellFamilyName == SPELLFAMILY_PALADIN)&& spellInfo_1->SpellIconID == spellInfo_2->SpellIconID && (spellId_1 == 35081 || spellId_2 == 35081))
+            return false;

        //I think we don't check this correctly because i need a exception for spell:
        //72,11327,18461...(called from 1856,1857...) Call Aura 16,31, after trigger another spell who call aura 77 and 77 remove 16 and 31, this should not happen.

http://filebeam.com/5683f4ff9a5d213b3871095684f9dc72

[VladimirMangos]

In [5821]. Thank you

[Ultron]

Not work in the form in which it was included in the SVN. SpellIconID is wrong. Correct SpellIconID is 561.

Index: SpellMgr.cpp
===================================================================
--- SpellMgr.cpp        (revision 5845)
+++ SpellMgr.cpp        (working copy)
@@ -1007,7 +1007,7 @@
                                return false;

                        // *Band of Eternal Champion and Seal of Command(multi-family check)
-                        if( spellId_1 == 35081 && spellInfo_2->SpellFamilyName == SPELLFAMILY_PALADIN && spellInfo_2->SpellIconID==992 && spellInfo_2->SpellVisual==7992)
+                        if( spellId_1 == 35081 && spellInfo_2->SpellFamilyName == SPELLFAMILY_PALADIN && spellInfo_2->SpellIconID==561 && spellInfo_2->SpellVisual==7992)
                                return false;
                        break;
                case SPELLFAMILY_MAGE:
@@ -1128,7 +1128,7 @@
                                return false;

                        // *Seal of Command and Band of Eternal Champion (multi-family check)
-                        if( spellInfo_1->SpellIconID==992 && spellInfo_1->SpellVisual==7992 && spellId_2 == 35081)
+                        if( spellInfo_1->SpellIconID==561 && spellInfo_1->SpellVisual==7992 && spellId_2 == 35081)
                                return false;
                        break;
                case SPELLFAMILY_SHAMAN:

[VladimirMangos]

Fixed in [5846]. Thank you