--HG--
branch : trunk
This commit is contained in:
QAston
2010-07-14 17:09:30 +02:00
parent a43ec3f158
commit d59cc55351
2 changed files with 13 additions and 14 deletions
+4 -5
View File
@@ -3566,10 +3566,10 @@ void Unit::_AddAura(UnitAura * aura, Unit * caster)
// find current aura from spell and change it's stackamount // find current aura from spell and change it's stackamount
if (Aura * foundAura = GetOwnedAura(aura->GetId(), aura->GetCasterGUID(), 0, aura)) if (Aura * foundAura = GetOwnedAura(aura->GetId(), aura->GetCasterGUID(), 0, aura))
{ {
if (foundAura->GetSpellProto()->StackAmount) if (aura->GetSpellProto()->StackAmount)
{ {
foundAura->ModStackAmount(foundAura->GetStackAmount()); aura->ModStackAmount(foundAura->GetStackAmount());
}
// Update periodic timers from the previous aura // Update periodic timers from the previous aura
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
{ {
@@ -3579,7 +3579,6 @@ void Unit::_AddAura(UnitAura * aura, Unit * caster)
continue; continue;
newEff->SetPeriodicTimer(existingEff->GetPeriodicTimer()); newEff->SetPeriodicTimer(existingEff->GetPeriodicTimer());
} }
}
// Use the new one to replace the old one // Use the new one to replace the old one
// This is the only place where AURA_REMOVE_BY_STACK should be used // This is the only place where AURA_REMOVE_BY_STACK should be used
@@ -7815,7 +7814,7 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura,
*handled = true; *handled = true;
if (pVictim->HasAura(53601)) 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); CastCustomSpell(pVictim, 66922, &bp0, NULL, NULL, true);
return true; return true;
} }