From ea26404c2bb7a0b0844a80b4def4e532416c85e1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 17 May 2024 16:39:28 +0800
Subject: [PATCH] 1

---
 server/gameserver/app.cc      |  5 +++++
 server/gameserver/pbutils.cc  | 16 ----------------
 server/gameserver/playermgr.h |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc
index a1831cf3..3042942a 100644
--- a/server/gameserver/app.cc
+++ b/server/gameserver/app.cc
@@ -165,6 +165,11 @@ void App::ProcessGameGateMsg(f8::MsgHdr* hdr)
                 Player* hum  = PlayerMgr::Instance()->GetPlayerBySocket(hdr->socket_handle);
                 if (hum) {
                     hdr->hum = hum;
+                    #ifdef MYDEBUG
+                    if (hum->GetSocketHandle() != hdr->socket_handle) {
+                        A8_ABORT();
+                    }
+                    #endif
                     ProcessNetMsg(handler, hum, hdr);
                 }
             }
diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 7734fe03..db436ab0 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -149,8 +149,6 @@ static Player* InternalCreatePlayer(std::shared_ptr<CustomBattle> p,
     hum->payload = m->GetNetData()->payload;
     PlayerMgr::Instance()->
         CreatePlayerByCustomMember(hum,
-                                   0,
-                                   0,
                                    m
                                    );
     hum->meta = mt::Hero::GetById(m->GetNetData()->GetHeroId());
@@ -2425,19 +2423,8 @@ void GGListener::ForceCloseChildSocket(int sockhandle)
 }
 
 Player* PlayerMgr::CreatePlayerByCustomMember(Player* hum,
-                                              long ip_saddr,
-                                              int socket,
                                               std::shared_ptr<CustomMember> member)
 {
-#ifdef MYDEBUG
-    a8::XPrintf("CreatePlayerByCustomMember account_id:%s socket_handle:%d\n",
-                {
-                 hum->account_id,
-                 socket,
-                });
-#endif
-    hum->SetSocketHandle(socket);
-    hum->SetIpSaddr(ip_saddr);
     hum->account_id = member->GetAccountId();
     hum->session_id = member->GetSessionId();
     hum->name = member->GetName();
@@ -2469,9 +2456,6 @@ Player* PlayerMgr::CreatePlayerByCustomMember(Player* hum,
         }
     }
     #endif
-    if (socket) {
-        socket_hash_[socket] = hum;
-    }
     return hum;
 }
 
diff --git a/server/gameserver/playermgr.h b/server/gameserver/playermgr.h
index 94031692..39fcfb3b 100644
--- a/server/gameserver/playermgr.h
+++ b/server/gameserver/playermgr.h
@@ -32,7 +32,7 @@ class PlayerMgr : public a8::Singleton<PlayerMgr>
 
     int OnlineNum();
     Player* GetPlayerBySocket(int socket);
-    Player* CreatePlayerByCustomMember(Player* hum, long ip_saddr, int socket,
+    Player* CreatePlayerByCustomMember(Player* hum,
                                        std::shared_ptr<CustomMember> member);
     size_t GetAccountNum() { return account_num_hash_.size(); }
     void IncAccountNum(const std::string& account_id);