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

Core/Auras: Use recalculated aura max duration on spell hit for duration calculations.

Browse Source
This commit is contained in:
QAston
2011-06-07 14:19:47 +02:00
parent 3effdb2c23
commit 9542077c38
4 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Auras/SpellAuras.cpp
+26 -16
View File
@@ -334,24 +334,13 @@ m_isRemoved(false), m_isSingleTarget(false)
if (m_spellProto->manaPerSecond || m_spellProto->manaPerSecondPerLevel)
m_timeCla = 1 * IN_MILLISECONDS;
Player* modOwner = NULL;
if (caster)
{
modOwner = caster->GetSpellModOwner();
m_maxDuration = caster->CalcSpellDuration(m_spellProto);
}
else
m_maxDuration = GetSpellDuration(m_spellProto);
if (IsPassive() && m_spellProto->DurationIndex == 0)
m_maxDuration = -1;
if (!IsPermanent() && modOwner)
modOwner->ApplySpellMod(GetId(), SPELLMOD_DURATION, m_maxDuration);
m_maxDuration = CalcMaxDuration(caster);
m_duration = m_maxDuration;
Player* modOwner = NULL;
if (caster)
modOwner = caster->GetSpellModOwner();
m_procCharges = m_spellProto->procCharges;
if (modOwner)
modOwner->ApplySpellMod(GetId(), SPELLMOD_CHARGES, m_procCharges);
@@ -700,6 +689,27 @@ void Aura::Update(uint32 diff, Unit * caster)
}
}
int32 Aura::CalcMaxDuration(Unit* caster) const
{
Player* modOwner = NULL;
int32 maxDuration;
if (caster)
{
modOwner = caster->GetSpellModOwner();
maxDuration = caster->CalcSpellDuration(m_spellProto);
}
else
maxDuration = GetSpellDuration(m_spellProto);
if (IsPassive() && m_spellProto->DurationIndex == 0)
maxDuration = -1;
if (!IsPermanent() && modOwner)
modOwner->ApplySpellMod(GetId(), SPELLMOD_DURATION, maxDuration);
return maxDuration;
}
void Aura::SetDuration(int32 duration, bool withMods)
{
if (withMods)