aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximius <none@none>2009-09-22 16:18:01 -0700
committermaximius <none@none>2009-09-22 16:18:01 -0700
commita9086ea15a6ef297714aef3c50f9b003a016050f (patch)
tree54917e39ef9c599491afca6a9fb38131fdd319df
parentb3f3a82e5fbd685567c2849d2787b4874e6204ae (diff)
*Another regen tweak, by Taliesin.
--HG-- branch : trunk
-rw-r--r--src/game/Creature.cpp2
1 files changed, 1 insertions, 1 deletions
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
{