diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 446d24a04dd..c5a8a27256f 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -967,9 +967,6 @@ void Aura::RefreshTimers(bool resetPeriodicTimer) { // Pandemic doesn't reset periodic timer resetPeriodicTimer = false; - - int32 pandemicDuration = CalculatePct(m_maxDuration, 30.f); - m_maxDuration = std::max(GetDuration(), std::min(pandemicDuration, GetDuration()) + m_maxDuration); } RefreshDuration(); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 0e4678bad96..2d9a97ae0de 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3267,6 +3267,12 @@ void Spell::DoSpellEffectHit(Unit* unit, SpellEffectInfo const& spellEffectInfo, if (!hitInfo.AuraDuration) hitInfo.AuraDuration = int32(origDuration * m_originalCaster->m_unitData->ModCastingSpeed); } + + if (refresh && m_spellInfo->HasAttribute(SPELL_ATTR13_PERIODIC_REFRESH_EXTENDS_DURATION)) + { + int32 newDuration = hitInfo.AuraDuration + hitInfo.HitAura->GetDuration(); + hitInfo.AuraDuration = std::min(newDuration, CalculatePct(hitInfo.AuraDuration, 130)); + } } } else |