Small update to creature respawn - by Iskander

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index f8643543038..493f505e327 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -422,7 +422,7 @@ void Creature::Update(uint32 diff)
                         if(targetGuid == m_DBTableGuid) // if linking self, never respawn (check delayed to next day)
                             SetRespawnTime(DAY);
                         else
-                            m_respawnTime = GetLinkedCreatureRespawnTime()+urand(5,MINUTE); // else copy time from master and add a little
+                            m_respawnTime = MAX(time(NULL),GetLinkedCreatureRespawnTime())+urand(5,MINUTE); // else copy time from master and add a little
                         SaveRespawnTime(); // also save to DB immediately
                     }
                     else
@@ -2365,4 +2365,4 @@ time_t Creature::GetLinkedCreatureRespawnTime() const
     }
 
     return 0;
-}
\ No newline at end of file
+}