*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/Creature.cpp b/src/game/Creature.cpp
index 01a3b057ce9..0627f6419fb 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1532,6 +1532,9 @@ bool Creature::LoadFromDB(uint32 guid, Map *map)
     // checked at creature_template loading
     m_defaultMovementType = MovementGeneratorType(data->movementType);
 
+    if(!data->dbData)
+        SetInternallyAdded();
+
     return true;
 }
 
@@ -2079,7 +2082,7 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /
 
 void Creature::SaveRespawnTime()
 {
-    if(isPet() || !m_DBTableGuid)
+    if(isSummon() || !m_DBTableGuid || m_isInternallyAdded)
         return;
 
     if(m_respawnTime > time(NULL))                          // dead (no corpse)