diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SevenWorldActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SevenWorldActivity.java index 86450ff57..ad514e6bb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SevenWorldActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SevenWorldActivity.java @@ -201,7 +201,8 @@ public class SevenWorldActivity extends AbstractActivity { int[][] integral = treasure.getIntegral(); int integralId = STableManager.getConfig(SQijieStage.class).get(FIRST_CHECKPOINT).getTreasureIntegral()[0]; Item item = user.getItemManager().getItem(integralId); - return item.getItemNum() >= integral[0][1]; + long num = item!=null ? item.getItemNum():0L; + return num >= integral[0][1]; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java index 4e9dbdde5..95548f324 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java @@ -153,19 +153,24 @@ public class CrossServiceLogic { arenaOfPlayerManager.setServerName(serverName); return arenaOfPlayerManager; } + + private void teamBuild(User user,int teamId,Map> teams,HashSet set){ + List team = user.getTeamPosManager().getTeamPosForHero().getOrDefault(teamId,new ArrayList<>()); + teams.put(teamId,team); + set.addAll(team); + } + private ArenaOfHeroManager buildArenaOfHeroManager(User user){ // 编队列表 Map> teams = new HashMap<>(); // 需要存储的英雄列表 HashSet set = new HashSet<>(); // 跨服世界阵编队 - List worldTeam = user.getTeamPosManager().getTeamPosForHero().getOrDefault(GlobalsDef.WORLD_TEAM_ARENA_DEFENSE,new ArrayList<>()); - teams.put(GlobalsDef.WORLD_TEAM_ARENA_DEFENSE,worldTeam); - set.addAll(worldTeam); + teamBuild(user,TeamEnum.WORLD_TEAM_ARENA_DEFENSE.getTeamId(),teams,set); // 主线阵容编队 - List firstTeam = user.getTeamPosManager().getTeamPosForHero().getOrDefault(GlobalsDef.FORMATION_NORMAL,new ArrayList<>()); - teams.put(GlobalsDef.FORMATION_NORMAL,firstTeam); - set.addAll(firstTeam); + teamBuild(user,TeamEnum.FORMATION_NORMAL.getTeamId(),teams,set); + // 主线阵容编队 + teamBuild(user,TeamEnum.SEVEN_WORLD_TEAM.getTeamId(),teams,set); // 英雄 Map heroes = new HashMap<>(); Map heroMap = user.getHeroManager().getHeroMap();