Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Fix a crash caused by RecalculateAmount when aura caster is not present.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-23 11:17:15 -05:00
parent a22aedf320
commit 7ef7f7fa82
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/SpellAuras.cpp
View File

@@ -851,7 +851,7 @@ void AuraEffect::ApplyModifier(bool apply, bool Real, bool changeAmount)
void AuraEffect::RecalculateAmount(bool applied)
{
Unit *caster = GetParentAura()->GetCaster();
int32 amount = GetParentAura()->GetStackAmount() * caster->CalculateSpellDamage(m_spellProto, GetEffIndex(), GetBasePoints(), m_target);
int32 amount = GetParentAura()->GetStackAmount() * (caster ? caster->CalculateSpellDamage(m_spellProto, GetEffIndex(), GetBasePoints(), NULL) : GetBasePoints());
// Reapply if amount change
if (amount!=GetAmount())
{
@@ -1524,12 +1524,14 @@ void AuraEffect::HandleAddModifier(bool apply, bool Real, bool changeAmount)
case SPELLMOD_EFFECT2:
case SPELLMOD_EFFECT3:
{
uint64 guid = m_target->GetGUID();
Unit::AuraMap & auras = m_target->GetAuras();
for(Unit::AuraMap::iterator iter = auras.begin(); iter != auras.end();++iter)
{
Aura * aur = iter->second;
// only passive auras-active auras should have amount set on spellcast and not be affected
if (aur->IsPassive() && isAffectedOnSpell(aur->GetSpellProto()))
// if aura is casted by others, it will not be affected
if (aur->IsPassive() && aur->GetCasterGUID() == guid && isAffectedOnSpell(aur->GetSpellProto()))
{
if (modOp == SPELLMOD_ALL_EFFECTS)
{