From 7396b641ae82adcf5afd2591957ff944b7964203 Mon Sep 17 00:00:00 2001
From: maximius <none@none>
Date: Sat, 26 Sep 2009 16:01:30 -0700
Subject: *Gundrak: GO Handling & Slad Ran script by Tartalo *Cleanup, and
 don't consider creatures to be in combat if they have no victim, or if their
 victim is a GM.

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

(limited to 'src/game/Creature.cpp')

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index a7e5153e255..6f24dbe1631 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -544,7 +544,8 @@ void Creature::Update(uint32 diff)
             if(!isAlive())
                 break;
 
-            bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed());
+            bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || !getVictim() ||
+                                                getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster());
 
             if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed)
                 m_regenTimer -= diff;
-- 
cgit v1.2.3