diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 3aa5bde..8cdae87 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -142,7 +142,7 @@ Player* Room::GetPlayerByUniId(int uniid) Human* Room::GetHumanByUniId(int uniid) { Entity* entity = GetEntityByUniId(uniid); - return entity->entity_type == ET_Player ? (Human*)entity : nullptr; + return entity && entity->entity_type == ET_Player ? (Human*)entity : nullptr; } Entity* Room::GetEntityByUniId(int uniid)