diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/AreaManager.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/AreaManager.java index 4aefa8d9a..9724f8a00 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/AreaManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/AreaManager.java @@ -131,20 +131,20 @@ public class AreaManager { continue; } Map addServerOrAreaIds = serverAreaInfoDb.getAddServerOrAreaIds(); - //大区吞并 + //大区吞并 本大区 if (serverAreaInfoCache != null) { Set> entries = addServerOrAreaIds.entrySet(); for (Map.Entry addServerOrAreaItem : entries) { Integer serverOrArea = addServerOrAreaItem.getKey(); Integer type = addServerOrAreaItem.getValue(); - //大区进行融合 + //大区进行融合 原大区 if (type == 2) { ServerAreaInfo serverAreaInfo = serverAreaInfoMapFromDB.get(serverOrArea); if (serverAreaInfoCache.getVersion() >= serverAreaInfo.getVersion()) { continue; } if (serverAreaInfo.getMasterServerId() == GameApplication.serverId) { - mineServerAreaInfo = serverAreaInfoDb; + mineServerAreaInfo = serverAreaInfoDb;//xin } } } @@ -180,6 +180,7 @@ public class AreaManager { public void run() { try { task(); + serverStateReset(); }catch (Exception e) { LOGGER.error(" serverArenaInfoManager get exception", e); } @@ -193,7 +194,7 @@ public class AreaManager { } } LOGGER.info(" serverArenaInfoManager not get redis lock,the serverid={},the oldArea={},the newArea={}", GameApplication.serverId, areaId, newAreaId); - serverStateReset(); + return true; }