diff options
Diffstat (limited to 'src/game/ObjectAccessor.h')
| -rw-r--r-- | src/game/ObjectAccessor.h | 10 |
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); |