From 815554bb048f97e2c3cf99fdea292cd5c1e1b5a7 Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Wed, 13 Sep 2023 14:58:10 +0000
Subject: [PATCH] 1

---
 server/masterserver/jsondatamgr.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/masterserver/jsondatamgr.cc b/server/masterserver/jsondatamgr.cc
index 1d72292..ee1afbd 100644
--- a/server/masterserver/jsondatamgr.cc
+++ b/server/masterserver/jsondatamgr.cc
@@ -23,9 +23,11 @@ void JsonDataMgr::UnInit()
 
 std::shared_ptr<a8::XObject> JsonDataMgr::GetConf()
 {
-    if (f8::App::Instance()->GetInstanceId() < 1 ||
-        f8::App::Instance()->GetInstanceId() > masterserver_cluster_json_.Size()) {
-        abort();
+    for (int i = 0; i < masterserver_cluster_json_.Size(); ++i) {
+        auto conf = masterserver_cluster_json_.At(i);
+        if (conf->At("instance_id")->AsXValue().GetInt() == f8::App::Instance()->GetInstanceId()) {
+            return conf;
+        }
     }
-    return masterserver_cluster_json_[f8::App::Instance()->GetInstanceId() - 1];
+    A8_ABORT();
 }