diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java index c246b2a98..8a1ac0990 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java @@ -123,19 +123,17 @@ public class BloodLogic { .build(); heroDefendFightInfos.add(heroFightInfo); } - List pokemonSkills = null; + List pokemonSkills = new ArrayList<>(); User user = UserManager.getUser(uid, true); if(user!=null&&!user.getPokemonManager().getPokemonTeamMap().isEmpty()){ pokemonSkills = HeroLogic.getInstance().getPokemonSkills(UserManager.getUser(uid)); } - CommonProto.FightTeamInfo.Builder builder = CommonProto.FightTeamInfo. + return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroDefendFightInfos) - .setTeamPassiveList(passiveSkill); - if(pokemonSkills != null){ - builder.addAllPokemonUnitList(pokemonSkills); - } - return builder.build(); + .addAllPokemonUnitList(pokemonSkills) + .setTeamPassiveList(passiveSkill) + .build(); }