From f15ecf3ba6f7efe295f7f4a818000332f5080633 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 2 Sep 2019 16:12:16 +0800 Subject: [PATCH] fix differdemon null --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 3 +++ 1 file changed, 3 insertions(+) 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 154e552a8..68f7c1867 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 @@ -943,6 +943,9 @@ public class HeroLogic { int pokemonId = teamPosForPokenInfo.getPokenId(); Pokemon pokemon = pokemonMap.get(pokemonId); SDifferDemonsStageConfig sDifferDemonsStageConfig = SDifferDemonsStageConfig.getsDifferDemonsStageConfigMap(pokemonId*100 + pokemon.getAllStage()); + if(StringUtil.isEmpty(sDifferDemonsStageConfig.getPassiveSkillString())){ + continue; + } pokenSkillResult.append(sDifferDemonsStageConfig.getPassiveSkillString()).append("|"); } String s = pokenSkillResult.toString();