diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 1c9328dbd..9076a9563 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -4032,7 +4032,7 @@ void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/) if(apply && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY) { - uint32 mechanic = 1 << m_modifier.m_miscvalue; + uint32 mechanic = 1 << misc; //immune movement impairment and loss of control if(GetId()==42292 || GetId()==59752) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 32345e283..c1b4ef8e8 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1520,9 +1520,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) { alreadyDone.insert(*i); uint32 damage=(*i)->GetModifier()->m_amount; - SpellEntry const *spellProto = sSpellStore.LookupEntry((*i)->GetId()); - if(!spellProto) - continue; + SpellEntry const *i_spellProto = (*i)->GetSpellProto(); //Calculate absorb resist ??? no data in opcode for this possibly unable to absorb or resist? //uint32 absorb; //uint32 resist; @@ -1534,13 +1532,13 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4)); data << uint64(pVictim->GetGUID()); data << uint64(GetGUID()); - data << uint32(spellProto->Id); + data << uint32(i_spellProto->Id); data << uint32(damage); // Damage data << uint32(0); // Overkill - data << uint32(spellProto->SchoolMask); + data << uint32(i_spellProto->SchoolMask); pVictim->SendMessageToSet(&data, true ); - pVictim->DealDamage(this, damage, 0, SPELL_DIRECT_DAMAGE, GetSpellSchoolMask(spellProto), spellProto, true); + pVictim->DealDamage(this, damage, 0, SPELL_DIRECT_DAMAGE, GetSpellSchoolMask(i_spellProto), i_spellProto, true); i = vDamageShields.begin(); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 56c84e03a..72011ea42 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 "8333" + #define REVISION_NR "8334" #endif // __REVISION_NR_H__