[10226] Fixed GO_JUST_DEACTIVATED for despawned by default gameobject.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
mangos · Jul 19, 2010 · 72e1253 · 72e1253 · rsa · Jul 19, 2010
1 parent 8961c01
commit 72e1253
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
@@ -417,14 +417,8 @@ void GameObject::Update(uint32 /*p_time*/)
             if(!m_respawnDelayTime)
                 return;
 
-            if(!m_spawnedByDefault)
-            {
-                m_respawnTime = 0;
-                return;
-            }
-
             // since pool system can fail to roll unspawned object, this one can remain spawned, so must set respawn nevertheless
-            m_respawnTime = time(NULL) + m_respawnDelayTime;
+            m_respawnTime = m_spawnedByDefault ? time(NULL) + m_respawnDelayTime : 0;
 
             // if option not set then object will be saved at grid unload
             if(sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY))

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10225"
+ #define REVISION_NR "10226"
 #endif // __REVISION_NR_H__