From 41d43be8e87560441e3f76029f547998c3a2146d Mon Sep 17 00:00:00 2001 From: Blumfield Date: Mon, 16 Jan 2017 12:09:58 +0100 Subject: [PATCH] [Spells] Anger Management should only work out of combat I can't figure out how to make the decay part work yet --- src/game/WorldHandlers/SpellAuras.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/WorldHandlers/SpellAuras.cpp b/src/game/WorldHandlers/SpellAuras.cpp index a56a97fa..cbb1354f 100644 --- a/src/game/WorldHandlers/SpellAuras.cpp +++ b/src/game/WorldHandlers/SpellAuras.cpp @@ -4770,8 +4770,8 @@ void Aura::PeriodicTick() // Anger Management // amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3 // so 17 is rounded amount for 5 sec tick grow ~ 1 range grow in 3 sec - if (powerType == POWER_RAGE) - { target->ModifyPower(powerType, m_modifier.m_amount * 3 / 5); } + if (powerType == POWER_RAGE && !target->IsInCombat()) + { target->ModifyPower(powerType, m_modifier.m_amount * 1 / 5); } break; } // Here tick dummy auras