[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, 8 insertions, 2 deletions

diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h
index 80aac0bcf92..fea928a54eb 100644
--- a/src/game/ObjectAccessor.h
+++ b/src/game/ObjectAccessor.h
@@ -103,8 +103,14 @@ class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor,
             if(!guid)
                 return NULL;
 
-            if(IS_PLAYER_GUID(guid))
-                return (Unit*)HashMapHolder<Player>::Find(guid);
+            if (IS_PLAYER_GUID(guid))
+            {
+                Unit * u = (Unit*)HashMapHolder<Player>::Find(guid);
+                if(!u || !u->IsInWorld())
+                    return NULL;
+
+                return u;
+            }
 
             if(IS_CREATURE_GUID(guid))
                 return (Unit*)HashMapHolder<Creature>::Find(guid);