1 files changed, 12 insertions, 3 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 001f22815b5..3bba445b99e 100755
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -832,7 +832,16 @@ void Map::MoveAllCreaturesInMoveList()
                 #ifdef TRINITY_DEBUG
                     sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) cannot be move to unloaded respawn grid.", c->GetGUIDLow(), c->GetEntry());
                 #endif
-                AddObjectToRemoveList(c);
+                //AddObjectToRemoveList(Pet*) should only be called in Pet::Remove
+                //This may happen when a player just logs in and a pet moves to a nearby unloaded cell
+                //To avoid this, we can load nearby cells when player log in
+                //But this check is always needed to ensure safety
+                //TODO: pets will disappear if this is outside CreatureRespawnRelocation
+                //need to check why pet is frequently relocated to an unloaded cell
+                if (c->isPet())
+                    ((Pet*)c)->Remove(PET_SAVE_NOT_IN_SLOT, true);
+                else
+                    AddObjectToRemoveList(c);
             }
         }
 
@@ -925,8 +934,8 @@ bool Map::CreatureRespawnRelocation(Creature *c)
         c->UpdateObjectVisibility(false);
         return true;
     }
-    else
-        return false;
+
+    return false;
 }
 
 bool Map::UnloadGrid(const uint32 x, const uint32 y, bool unloadAll)