From 31fd441ae8ffba911f627f76ce10148241d50d8a Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 29 Jul 2021 11:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E8=8E=B7=E5=8F=96=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/GameApplication.java | 2 ++ .../com/ljsd/jieling/logic/family/CrossDeathPathLogic.java | 7 +++++-- .../main/java/com/ljsd/jieling/thread/task/MinuteTask.java | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index c0f26b807..35cc170c7 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -6,6 +6,7 @@ import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.logic.dao.ServerConfig; +import com.ljsd.jieling.logic.family.CrossDeathPathLogic; import com.ljsd.jieling.network.NetManager; import com.ljsd.jieling.util.ConfigurableApplicationContextManager; import config.SGameSetting; @@ -59,6 +60,7 @@ public class GameApplication { GameLogicService.getInstance().onStart(); NetManager.getInstance().init(); SkyEyeService.getInstance().onStart(); + CrossDeathPathLogic.getInstance().serverInit(); //控制台gm Scanner sc = new Scanner(System.in); while(sc.hasNext()) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java index 1f3dbd2c9..cdb5f6580 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java @@ -137,11 +137,14 @@ public class CrossDeathPathLogic { * @return */ public String getServerName(int serverId){ + String name = String.valueOf(serverId); CServerInfo cServerInfo = cServerInfoMap.get(serverId); if(cServerInfo==null){ - return String.valueOf(serverId); + serverInit(); + cServerInfo = cServerInfoMap.get(serverId); } - return cServerInfo.getName(); + name = cServerInfo!=null?cServerInfo.getName():name; + return name; } public String getServerNameByDeathPath(int serverId){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index fbc620fbb..6665bd7cf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -218,8 +218,6 @@ public class MinuteTask extends Thread { }); ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker); } - // 跨服服务器刷新 - CrossDeathPathLogic.getInstance().serverInit(); // LOGGER.info("{}更新公会援助完毕",guildInfoEntry.getValue().getName()); // //统一清除