josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Auras: Fix work of proc auras are refreshed during proc event routine.

Browse Source
This commit is contained in:
QAston
2011-06-21 12:03:54 +02:00
parent aa55e2a417
commit 2a47163771
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+6 -8
View File
@@ -14246,6 +14246,12 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag,
if (i->aura->IsRemoved()) if (i->aura->IsRemoved())
continue; continue;
// don't allow to proc from spells which have been recasted during spell proc
// this code is a temp workaround, to fix procs of auras refreshed during other aura procs
// will be dropped soon because of the new proc system implementation
if (i->aura->GetDuration() == i->aura->GetMaxDuration())
continue;
bool useCharges = i->aura->GetCharges() > 0; bool useCharges = i->aura->GetCharges() > 0;
bool takeCharges = false; bool takeCharges = false;
SpellEntry const* spellInfo = i->aura->GetSpellProto(); SpellEntry const* spellInfo = i->aura->GetSpellProto();
@@ -14407,14 +14413,6 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag,
takeCharges = true; takeCharges = true;
else else
{ {
// Spell own direct damage at apply wont break the CC
if (procSpell && (procSpell->Id == triggeredByAura->GetId()))
{
Aura* aura = triggeredByAura->GetBase();
// called from spellcast, should not have ticked yet
if (aura->GetDuration() == aura->GetMaxDuration())
break;
}
int32 damageLeft = triggeredByAura->GetAmount(); int32 damageLeft = triggeredByAura->GetAmount();
// No damage left // No damage left
if (damageLeft < int32(damage)) if (damageLeft < int32(damage))