diff options
| author | maximius <none@none> | 2009-09-26 16:01:30 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-26 16:01:30 -0700 |
| commit | 7396b641ae82adcf5afd2591957ff944b7964203 (patch) | |
| tree | b6d54ca311e779ae4e77b569b9a367dc26a4938a /src/game/Creature.cpp | |
| parent | ff3f556423bc90f8476c8b09bacb60cd621b2664 (diff) | |
*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
Diffstat (limited to 'src/game/Creature.cpp')
| -rw-r--r-- | src/game/Creature.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; |