From a9086ea15a6ef297714aef3c50f9b003a016050f Mon Sep 17 00:00:00 2001
From: maximius <none@none>
Date: Tue, 22 Sep 2009 16:18:01 -0700
Subject: *Another regen tweak, by Taliesin.

--HG--
branch : trunk
---
 src/game/Creature.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 77b846b3d35..a9b4aa0bec5 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -531,7 +531,7 @@ void Creature::Update(uint32 diff)
 
             bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed());
 
-            if(m_regenTimer > diff || bNotInCombatOrIsPolymorphed)
+            if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed)
                 m_regenTimer -= diff;
             else
             {
-- 
cgit v1.2.3