diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 516c08825..e1965e466 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -395,11 +395,11 @@ public class GMRequestHandler extends BaseHandler{ Runtime.getRuntime().exec(cmd); } else {// Linux 系统 // 格式:yyyyMMdd - cmd = " date -s "+ dataLinux; - Runtime.getRuntime().exec(cmd); - // 格式 HH:mm:ss - cmd = " date -s "+ time; - Runtime.getRuntime().exec(cmd); +// cmd = " date -s "+ dataLinux; +// Runtime.getRuntime().exec(cmd); +// // 格式 HH:mm:ss +// cmd = " date -s "+ time; +// Runtime.getRuntime().exec(cmd); } } catch (IOException e) { LOGGER.error("update->uid={},msg={}", uid, e.getMessage(), e); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 4034c6556..6f6b8f631 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1437,7 +1437,7 @@ public class HeroLogic{ Map heroSkillAdMap = new HashMap<>(); heroSkillList.forEach(skill->{ SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill); - if(config.getValue()[2] !=4){ + if(null!=config.getValue()&&config.getValue().length>2&&config.getValue()[2] !=4){ PassiveskillCalEnum.calEnumMap.get(config.getType()).getPassiveSkillProcessor().process(config,hero,heroSkillAdMap); }