araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-16 13:09:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: More generic implementation of Combustion

Browse Source 
Closes #60 & #78
This commit is contained in:
tobmaps
2011-05-11 04:17:38 +07:00
parent 492e6fd3da
commit 09fb6f555f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7908,17 +7908,11 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura,
//last charge and crit
if (triggeredByAura->GetCharges() <= 1 && (procEx & PROC_EX_CRITICAL_HIT))
{
RemoveAurasDueToSpell(28682); //-> remove Combustion auras
return true; // charge counting (will removed)
}
// This function can be called twice during one spell hit (Area of Effect spells)
// Make sure 28682 wasn't already removed by previous call
if (HasAura(28682))
this->CastSpell(this, 28682, true);
CastSpell(this, 28682, true);
return false; // ordinary chrages will be removed during crit chance computations.
return (procEx & PROC_EX_CRITICAL_HIT) ? true : false;
}
// Empowered Fire
case 31656: