[svn] Fix SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY spells, patch provided by QAston.

Fix priest's fear. Is breakable now.

--HG--
branch : trunk

2 files changed, 8 insertions, 4 deletions

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index a7f73ac7e45..532eb839af1 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2037,13 +2037,13 @@ void SpellMgr::LoadSpellExtraAttr()
     // Psychic Scream
     SpellEntry *tempSpell;
     if(tempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(8122))
-        tempSpell->AttributesEx |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
+        tempSpell->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
     if(tempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(8124))
-        tempSpell->AttributesEx |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
+        tempSpell->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
     if(tempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(10888))
-        tempSpell->AttributesEx |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
+        tempSpell->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
     if(tempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(10890))
-        tempSpell->AttributesEx |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
+        tempSpell->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
 }
 
 void SpellMgr::LoadSpellLinked()
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 91821febb39..f997ce6b506 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -2803,6 +2803,10 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
     if (pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode())
         return SPELL_MISS_EVADE;
 
+    // If Spel has this flag cannot be resisted/immuned/etc
+    if (spell->Attributes & SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY)
+        return SPELL_MISS_NONE;
+
     // Check for immune (use charges)
     if (pVictim->IsImmunedToSpell(spell,true))
         return SPELL_MISS_IMMUNE;