diff options
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 25 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.cpp | 2 |
2 files changed, 13 insertions, 14 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4d4e0e1c135..b3cfa7f287f 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3566,19 +3566,18 @@ void Unit::_AddAura(UnitAura * aura, Unit * caster) // find current aura from spell and change it's stackamount if (Aura * foundAura = GetOwnedAura(aura->GetId(), aura->GetCasterGUID(), 0, aura)) { - if (foundAura->GetSpellProto()->StackAmount) + if (aura->GetSpellProto()->StackAmount) { - foundAura->ModStackAmount(foundAura->GetStackAmount()); - - // Update periodic timers from the previous aura - for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) - { - AuraEffect *existingEff = foundAura->GetEffect(i); - AuraEffect *newEff = aura->GetEffect(i); - if (!existingEff || !newEff) - continue; - newEff->SetPeriodicTimer(existingEff->GetPeriodicTimer()); - } + aura->ModStackAmount(foundAura->GetStackAmount()); + } + // Update periodic timers from the previous aura + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + { + AuraEffect *existingEff = foundAura->GetEffect(i); + AuraEffect *newEff = aura->GetEffect(i); + if (!existingEff || !newEff) + continue; + newEff->SetPeriodicTimer(existingEff->GetPeriodicTimer()); } // Use the new one to replace the old one @@ -7815,7 +7814,7 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura, *handled = true; if (pVictim->HasAura(53601)) { - int32 bp0 = (damage/12) * SpellMgr::CalculateSpellEffectAmount(procSpell, 2)/100; + int32 bp0 = (damage/12) * SpellMgr::CalculateSpellEffectAmount(dummySpell, 2)/100; CastCustomSpell(pVictim, 66922, &bp0, NULL, NULL, true); return true; } diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index c8672780c13..42f1f151dd9 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -470,7 +470,7 @@ void Aura::UpdateTargetMap(Unit * caster, bool apply) // check target immunities if (itr->first->IsImmunedToSpell(GetSpellProto()) // check area target requirements - || (itr->first != GetOwner() && !CheckAreaTarget(itr->first))) + || (itr->first != GetOwner() && !CheckAreaTarget(itr->first))) addUnit = false; if (addUnit) |