diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc index 5525a5c..25d014c 100644 --- a/server/gameserver/matchteam.cc +++ b/server/gameserver/matchteam.cc @@ -444,11 +444,13 @@ bool MatchTeam::CanCombine(MatchTeam* b) #ifdef DEBUG a8::XPrintf("CanCombine 21\n", {}); #endif + return false; } if (b->GetValidSocketNum() <= 0) { #ifdef DEBUG a8::XPrintf("CanCombine 22\n", {}); #endif + return false; } if (HasSameCurrMember(b)) { #ifdef DEBUG diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc index 56daecb..f9146b2 100644 --- a/server/gameserver/playermgr.cc +++ b/server/gameserver/playermgr.cc @@ -25,7 +25,13 @@ void PlayerMgr::_SS_WSP_SocketDisconnect(f8::MsgHdr& hdr, const ss::SS_WSP_Socke RemovePlayerBySocket(hdr.socket_handle); hum->room->OnPlayerOffline(hum); } +#if DEBUG + a8::XPrintf("remove socket1 %d\n", {hdr.socket_handle}); +#endif if (MatchMgr::Instance()->GetMatchInfo(hdr.socket_handle)) { +#if DEBUG + a8::XPrintf("remove socket2 %d\n", {hdr.socket_handle}); +#endif MatchMgr::Instance()->RemoveSocket(hdr.socket_handle); } }