Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 2a47163771.
This commit is contained in:
QAston
2011-06-21 15:58:30 +02:00
parent fcc02a045a
commit 2ac777f8ce
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -14246,12 +14246,6 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag,
if (i->aura->IsRemoved())
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 takeCharges = false;
SpellEntry const* spellInfo = i->aura->GetSpellProto();
@@ -14413,6 +14407,14 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag,
takeCharges = true;
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();
// No damage left
if (damageLeft < int32(damage))