From 362c34e325303411b0e3b4d53c818e744f66aae8 Mon Sep 17 00:00:00 2001 From: gaojie Date: Fri, 18 Jan 2019 10:17:31 +0800 Subject: [PATCH] fix --- .../java/com/ljsd/jieling/handler/GetAllItemHandler.java | 8 ++++---- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java index 3ceafcf29..e933f889b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java @@ -36,14 +36,14 @@ public class GetAllItemHandler extends BaseHandler { int token = netData.getToken(); int msgId = netData.getMsgId(); int msgIndex = netData.getIndex(); - PlayerInfoProto.PlayerInfo.GetItemInfoRequest getItemInfoRequest - = PlayerInfoProto.PlayerInfo.GetItemInfoRequest.parseFrom(netData.parseClientProtoNetData()); + PlayerInfoProto.GetItemInfoRequest getItemInfoRequest + = PlayerInfoProto.GetItemInfoRequest.parseFrom(netData.parseClientProtoNetData()); LOGGER.info("processMessage->uid={},token={},msgId={},msgIndex={},messageNum={},messageStr={}", userId, token,msgId,msgIndex,getItemInfoRequest.getNum(),getItemInfoRequest.getStr()); User user = UserManager.getUserForLogin(userId); - List itemList = ItemUtil.getAllItem(user); - PlayerInfoProto.PlayerInfo.GetItemInfoResponse getItemInfoResponse = PlayerInfoProto.PlayerInfo.GetItemInfoResponse.newBuilder() + List itemList = ItemUtil.getAllItem(user); + PlayerInfoProto.GetItemInfoResponse getItemInfoResponse = PlayerInfoProto.GetItemInfoResponse.newBuilder() .addAllItemlist(itemList) .build(); try { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index cf64a65ca..398147177 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -59,8 +59,8 @@ public class ItemUtil { } - public static List getAllItem(User user){ - List itemList = new ArrayList<>(); + public static List getAllItem(User user){ + List itemList = new ArrayList<>(); ItemManager itemManager = user.getItemManager(); Map itemMap = itemManager.getItemMap(); if (itemMap.size() !=0 ){