From 36884b36f1d30c24df62f01e46c79bfaeda51834 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 21 Jun 2021 05:29:38 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=AF=E5=8A=A8=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1ip=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/jsondatamgr.cc | 10 ++++++++++
 server/gameserver/roommgr.cc     |  1 -
 third_party/a8engine             |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/jsondatamgr.cc b/server/gameserver/jsondatamgr.cc
index 17f605e..24ca362 100644
--- a/server/gameserver/jsondatamgr.cc
+++ b/server/gameserver/jsondatamgr.cc
@@ -47,6 +47,16 @@ void JsonDataMgr::Init()
     if (GetConf()->HasKey("channel")) {
         channel = GetConf()->At("channel")->AsXValue();
     }
+#ifdef DEBUG
+    if (!f8::IsOnlineEnv()) {
+        if (!f8::IsTestEnv()) {
+            bool ok = a8::GetLocalIp(ip);
+            if (!ok) {
+                abort();
+            }
+        }
+    }
+#endif
     server_info = a8::Format("%s:%d", {ip, listen_port});
     Reload();
 
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 5ef6982..4d6e309 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -98,7 +98,6 @@ static RoomType_e GetHumanRoomType(const cs::CMJoin& msg, int& game_times)
 void RoomMgr::Init()
 {
     InstallReportStateTimer();
-    gm_hash_["6001_2005_oTR6b5d0UzpqJ1w-QbdUawWimgz0"] = 1;
 }
 
 void RoomMgr::UnInit()
diff --git a/third_party/a8engine b/third_party/a8engine
index f0ee3fb..b16f9a6 160000
--- a/third_party/a8engine
+++ b/third_party/a8engine
@@ -1 +1 @@
-Subproject commit f0ee3fb68faa185ff78f4c59c9a1edeb91b70031
+Subproject commit b16f9a6176bfac30c0e7d29ec6df37e750fd1c60