[8103] More wide use IsInWorld checks and delayed at teleport operations. Author: Ambal

    * IsInWorld used to prevent return unexpected not in world objects.
    * Delayed operations need to process its in world state.

--HG--
branch : trunk

1 files changed, 3 insertions, 0 deletions

diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index ad3389c8ab4..3d92caa406c 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -500,6 +500,9 @@ void WorldSession::HandlePetAbandon( WorldPacket & recv_data )
     recv_data >> guid;                                      //pet guid
     sLog.outDetail( "HandlePetAbandon. CMSG_PET_ABANDON pet guid is %u", GUID_LOPART(guid) );
 
+    if(!_player->IsInWorld())
+        return;
+
     // pet/charmed
     Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid);
     if(pet)