diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 8a017e015..d453ed938 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -200,10 +200,17 @@ public class GlobalDataManaager { checkSystemFunctioIsOpen(); GlobalSystemControl globalSystemControl = MongoUtil.getInstence().getMyMongoTemplate().findById(GameApplication.serverId, GlobalSystemControl.class); if(globalSystemControl != null){ + TimeControllerOfFunction timeControllerOfFunction = globalSystemControl.getTimeControllerOfFunctionMap().get(8); - ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes()); - MapLogic.getInstance().updateEndlessSeason(globalSystemControl.getTimeControllerOfFunctionMap().get(46).getTimes()); - MapLogic.setEndlessMapId(getEndleeMapIdByLevel()); + if(timeControllerOfFunction != null){ + ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes()); + } + if(globalSystemControl.getTimeControllerOfFunctionMap().containsKey(46)){ + MapLogic.getInstance().updateEndlessSeason(globalSystemControl.getTimeControllerOfFunctionMap().get(46).getTimes()); + MapLogic.setEndlessMapId(getEndleeMapIdByLevel()); + } + + } MissionEventDistributor.init(); DataManagerDistributor.init(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java index e5fefe1a8..697af2219 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java @@ -27,7 +27,7 @@ public class GuildMyInfo extends MongoBase { public void clearOfLevelGuild(){ path.clear(); - curPos = 257; + curPos = initPos; setCurPos(curPos); setPath(new ArrayList<>()); }