diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 1c07ad05..1f371cd2 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -131,7 +131,6 @@ static void Human_FillBodyState(Human* self, ::google::protobuf::RepeatedPtrFiel static Player* InternalCreatePlayer(std::shared_ptr p, std::shared_ptr m, - std::shared_ptr net_team, std::shared_ptr room_team, cs::CMJoin& join_msg) { @@ -2790,13 +2789,22 @@ int Room::InitWithCustomBattle(long ip_saddr, int socket_handle, std::shared_ptr auto room_team = room_teams.at(i); net_team->TraverseMember ( - [join_msg, p, net_team, room_team] (std::shared_ptr m) mutable -> bool + [join_msg, p, room_team] (std::shared_ptr m) mutable -> bool { - Player* hum = InternalCreatePlayer(p, m, net_team, room_team, join_msg); + Player* hum = InternalCreatePlayer(p, m, room_team, join_msg); return true; } ); } + { + p->TraverseObList + ( + [join_msg, p] (std::shared_ptr m) mutable -> bool + { + Player* hum = InternalCreatePlayer(p, m, nullptr, join_msg); + return true; + }); + } { auto hum = GetPlayerByAccountId(msg->account_id()); if (hum) {