diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java index 7088a5bc3..c74d184c1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java @@ -152,7 +152,7 @@ public class EndConfirmExpeditionBattleRequestHandler extends BaseHandler heroFightInfos = new ArrayList<>(); List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { - Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); + Hero hero; + + if(teamId==GlobalsDef.EXPEDITION_TEAM&&user.getExpeditionManager().getHeroMap().containsKey(teamPosHeroInfo.getHeroId())){ + hero =user.getExpeditionManager().getHeroMap().get(teamPosHeroInfo.getHeroId()); + }else { + hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); + } if (hero == null) { continue; }