fix null
parent
a00a5f4597
commit
3d0e7cebc6
|
@ -1288,16 +1288,20 @@ public class MapLogic {
|
|||
heroForces += HeroLogic.getInstance().calHeoForce(user, hero);
|
||||
crossInfo.getHeroIds().add(hero.getTemplateId());
|
||||
}
|
||||
// 异妖
|
||||
crossInfo.getPokemons().clear();
|
||||
|
||||
List<TeamPosForPokenInfo> 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) {
|
||||
|
|
Loading…
Reference in New Issue