Merge branch 'master_prb_gn' into master_test_gn

2022-01-15 11:08:09 +08:00 · 2022-01-15 11:08:09 +08:00 · cf6c9cc9ff
parent 70d69c58b4 5cecf52687
commit cf6c9cc9ff
1 changed files with 3 additions and 0 deletions
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/passiveSkillCal/PassiveskillCalEnum.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/passiveSkillCal/PassiveskillCalEnum.java
@ -96,6 +96,9 @@ public enum PassiveskillCalEnum {
        //被动技能，编队每增加一个同属性英雄属性额外增加一定数值
        float[] value = config.getValue();
        List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId);
+        if (teamPosHeroInfos == null) {
+            return;
+        }
        int haveNum=0;
        for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) {
            Hero localHero=user.getHeroManager().getHero(teamPosHeroInfo.getHeroId());