mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8334] Small cleanup in magic shield back damage code.

Browse source 
Also misc variable use consistence in aura hander (no any affect expected).
This commit is contained in:
VladimirMangos 2009-08-09 08:08:23 +04:00
parent a2b952b15e
commit fe4b057dc2
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/SpellAuras.cpp
View file

@ -4032,7 +4032,7 @@ void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/)
if(apply && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY) 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 //immune movement impairment and loss of control
if(GetId()==42292 || GetId()==59752) if(GetId()==42292 || GetId()==59752)

10
src/game/Unit.cpp
View file

@ -1520,9 +1520,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
{ {
alreadyDone.insert(*i); alreadyDone.insert(*i);
uint32 damage=(*i)->GetModifier()->m_amount; uint32 damage=(*i)->GetModifier()->m_amount;
SpellEntry const *spellProto = sSpellStore.LookupEntry((*i)->GetId()); SpellEntry const *i_spellProto = (*i)->GetSpellProto();
if(!spellProto)
continue;
//Calculate absorb resist ??? no data in opcode for this possibly unable to absorb or resist? //Calculate absorb resist ??? no data in opcode for this possibly unable to absorb or resist?
//uint32 absorb; //uint32 absorb;
//uint32 resist; //uint32 resist;
@ -1534,13 +1532,13 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4)); WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4));
data << uint64(pVictim->GetGUID()); data << uint64(pVictim->GetGUID());
data << uint64(GetGUID()); data << uint64(GetGUID());
data << uint32(spellProto->Id); data << uint32(i_spellProto->Id);
data << uint32(damage); // Damage data << uint32(damage); // Damage
data << uint32(0); // Overkill data << uint32(0); // Overkill
data << uint32(spellProto->SchoolMask); data << uint32(i_spellProto->SchoolMask);
pVictim->SendMessageToSet(&data, true ); 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(); i = vDamageShields.begin();
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8333" #define REVISION_NR "8334"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__