From cbfee44510adad8c04f1054501c804fc6e78638a Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 19 Feb 2020 10:58:09 +0800 Subject: [PATCH] =?UTF-8?q?Task=E3=80=90ID1005460=E3=80=91=E3=80=90?= =?UTF-8?q?=E7=8E=A9=E6=B3=95=E9=9C=80=E6=B1=82=E3=80=91=E7=8C=8E=E5=A6=96?= =?UTF-8?q?=E4=B9=8B=E8=B7=AF=20=E8=8A=82=E7=82=B9=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EndExpeditionBattleRequest.java | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java index 874942467..ed638281d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java @@ -119,22 +119,6 @@ public class EndExpeditionBattleRequest extends BaseHandler nodeInfos = new HashSet<>(); - user.getExpeditionManager().getExpeditionNodeInfos().forEach((s, nodeInfo1) -> { - if (nodeInfo1.getLay() != oldlay) { - return; - } - CommonProto.ExpeditionNodeInfo.Builder build = CommonProto.ExpeditionNodeInfo.newBuilder() - .setSortId(nodeInfo1.getSortId()) - .setState(nodeInfo1.getState()); - if (nodeInfo1.getSortId() == nodeId) { - build.setBossTeaminfo(ExpeditionLogic.getExpeditionTeamInfoProto(nodeInfo1)); - }else { - return; - } - nodeInfos.add(build.build()); - }); - Set ids = new HashSet<>(); if (resultCode != 1) { @@ -156,14 +140,13 @@ public class EndExpeditionBattleRequest extends BaseHandler getNodePro(User user,int oldlay,int nodeId){ + Set nodeInfos = new HashSet<>(); + user.getExpeditionManager().getExpeditionNodeInfos().forEach((s, nodeInfo1) -> { + if (nodeInfo1.getLay() != oldlay) { + return; + } + CommonProto.ExpeditionNodeInfo.Builder build = CommonProto.ExpeditionNodeInfo.newBuilder() + .setSortId(nodeInfo1.getSortId()) + .setState(nodeInfo1.getState()); + if (nodeInfo1.getSortId() == nodeId) { + build.setBossTeaminfo(ExpeditionLogic.getExpeditionTeamInfoProto(nodeInfo1)); + }else { + return; + } + nodeInfos.add(build.build()); + }); + return nodeInfos; + } }