From 1fc55be04f9bb5157cf9f788a0d9f1fb12905de2 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 17 May 2024 18:01:43 +0800 Subject: [PATCH] 1 --- server/gameserver/pbutils.cc | 2 +- server/gameserver/tracemgr.cc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index b1cadabe..d18edd91 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -2267,7 +2267,7 @@ void Human::ReJoin(long ip_saddr, int socket_handle) abort(); } auto old_socket_handle = GetSocketHandle(); - if (SocketIsValid()) { + if (SocketIsValid() && socket_handle != GetSocketHandle()) { GGListener::Instance()->ForceCloseChildSocket(GetSocketHandle()); PlayerMgr::Instance()->RemovePlayerBySocket(GetSocketHandle()); } diff --git a/server/gameserver/tracemgr.cc b/server/gameserver/tracemgr.cc index 1f9c51b4..8b59cf27 100644 --- a/server/gameserver/tracemgr.cc +++ b/server/gameserver/tracemgr.cc @@ -34,7 +34,9 @@ void TraceMgr::Trace(const std::string& hint) void TraceMgr::PrintBackTrace() { + #if 0 std::cout << boost::stacktrace::stacktrace(); + #endif } #endif