From b6fc90b9bc225cf560d0d442935c83f3183284e1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 16 Aug 2019 14:21:55 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 1837412..f5f9cfd 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -134,7 +134,7 @@ Player* Room::GetPlayerByAccountId(const std::string& accountid) Player* Room::GetPlayerByUniId(int uniid) { Entity* entity = GetEntityByUniId(uniid); - return entity->entity_type == ET_Player && entity->entity_subtype == EST_Player ? (Player*)entity : nullptr; + return entity && entity->entity_type == ET_Player && entity->entity_subtype == EST_Player ? (Player*)entity : nullptr; } Entity* Room::GetEntityByUniId(int uniid)