*Move addcre/go functions from opvp to objmgr.

*Do not save respawn time for internally added cre/go.

--HG--
branch : trunk

1 files changed, 4 insertions, 1 deletions

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index 0cc32ce4f2d..ea848e95a52 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -628,6 +628,9 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map)
         }
     }
 
+    if(!data->dbData)
+        SetInternallyAdded();
+
     return true;
 }
 
@@ -707,7 +710,7 @@ Unit* GameObject::GetOwner() const
 
 void GameObject::SaveRespawnTime()
 {
-    if(m_respawnTime > time(NULL) && m_spawnedByDefault)
+    if(!m_isInternallyAdded && m_respawnTime > time(NULL) && m_spawnedByDefault)
         objmgr.SaveGORespawnTime(m_DBTableGuid,GetInstanceId(),m_respawnTime);
 }