diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 733dff58e..5f1e61fbe 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1288,16 +1288,20 @@ public class MapLogic { heroForces += HeroLogic.getInstance().calHeoForce(user, hero); crossInfo.getHeroIds().add(hero.getTemplateId()); } - // 异妖 - crossInfo.getPokemons().clear(); + List teamPosForPokenInfos = user.getTeamPosManager().getTeamPosForPoken().get(mapManager.getTeamId()); - for (TeamPosForPokenInfo teamPosForPokenInfo : teamPosForPokenInfos) { - Pokemon pokemon = user.getPokemonManager().getPokemonMap().get(teamPosForPokenInfo.getPokenId()); - if (pokemon == null) { - continue; + if(teamPosForPokenInfos!=null){ + // 异妖 + crossInfo.getPokemons().clear(); + for (TeamPosForPokenInfo teamPosForPokenInfo : teamPosForPokenInfos) { + Pokemon pokemon = user.getPokemonManager().getPokemonMap().get(teamPosForPokenInfo.getPokenId()); + if (pokemon == null) { + continue; + } + crossInfo.getPokemons().add(pokemon.getId()); } - crossInfo.getPokemons().add(pokemon.getId()); } + crossInfo.setForces(heroForces); SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapManager.getCurMapId()); if (sChallengeMapConfig.getIfRank() == 1) {