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

[10987] Prevent deleting reflect source aura ebfore reflected spell cast.

Browse source
This commit is contained in:
VladimirMangos 2011-01-09 00:52:13 +03:00
parent 287229bfdb
commit 6e241689e7
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Unit.cpp
View file

@ -2055,6 +2055,7 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
reflectDamage = currentAbsorb / 2; reflectDamage = currentAbsorb / 2;
reflectSpell = 33619; reflectSpell = 33619;
reflectTriggeredBy = *i; reflectTriggeredBy = *i;
reflectTriggeredBy->SetInUse(true); // lock aura from final deletion until processing
break; break;
} }
if (spellProto->Id == 39228 || // Argussian Compass if (spellProto->Id == 39228 || // Argussian Compass
@ -2130,6 +2131,7 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
reflectDamage = (*k)->GetModifier()->m_amount * RemainingDamage/100; reflectDamage = (*k)->GetModifier()->m_amount * RemainingDamage/100;
reflectSpell = 33619; reflectSpell = 33619;
reflectTriggeredBy = *i; reflectTriggeredBy = *i;
reflectTriggeredBy->SetInUse(true);// lock aura from final deletion until processing
} break; } break;
default: break; default: break;
} }
@ -2237,7 +2239,11 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
// Cast back reflect damage spell // Cast back reflect damage spell
if (canReflect && reflectSpell) if (canReflect && reflectSpell)
{
CastCustomSpell(pCaster, reflectSpell, &reflectDamage, NULL, NULL, true, NULL, reflectTriggeredBy); CastCustomSpell(pCaster, reflectSpell, &reflectDamage, NULL, NULL, true, NULL, reflectTriggeredBy);
reflectTriggeredBy->SetInUse(false); // free lock from deletion
}
// absorb by mana cost // absorb by mana cost
AuraList const& vManaShield = GetAurasByType(SPELL_AURA_MANA_SHIELD); AuraList const& vManaShield = GetAurasByType(SPELL_AURA_MANA_SHIELD);

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 "10986" #define REVISION_NR "10987"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__