From 790273b96f29b3959e01542438037e18b3fd5146 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 2 Apr 2020 15:23:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 9057d2d36..bdaa042d5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1000,7 +1000,6 @@ public class ItemUtil { } StringBuilder reward = new StringBuilder(); List equipList = new CopyOnWriteArrayList<>(); - List especialEquip = new CopyOnWriteArrayList<>(); for (Map.Entry entry : equipMap.entrySet()) { int itemType = SItem.getsItemMap().get(entry.getKey()).getItemType(); if(!filter.contains(itemType)){ @@ -1016,7 +1015,7 @@ public class ItemUtil { } continue; } - addEquip(user, entry.getKey(), equipList,especialEquip); + addEquip(user, entry.getKey(), equipList); KtEventUtils.onKtEvent(user, ParamEventBean.UserItemEvent,reason,GlobalsDef.addReason,entry.getKey(),1,-1); } } @@ -1027,14 +1026,12 @@ public class ItemUtil { MessageUtil.nofityBagIsFull(user); } dropBuilder.addAllEquipId(equipList); - dropBuilder.addAllEspecialEquipId(especialEquip); } public static void addSoulEquip(User user, Map equipMap, CommonProto.Drop.Builder dropBuilder,int reason) throws Exception { if (equipMap.isEmpty()) { return; } - List especialEquip = new CopyOnWriteArrayList<>(); List equipList = new CopyOnWriteArrayList<>(); List filter = new ArrayList<>(); filter.add(GlobalItemType.SOUL_MARK); @@ -1075,7 +1072,7 @@ public class ItemUtil { } int count = entry.getValue(); for (int i = 0; i < count; i++) { - addEquip(user, entry.getKey(), equipList,especialEquip); + addEquip(user, entry.getKey(), equipList); } } dropBuilder.addAllSoulEquip(equipList); @@ -1100,7 +1097,7 @@ public class ItemUtil { return reward.toString(); } - private static void addEquip(User user,int equipId ,List equipList,List especialEquipList) throws Exception { + private static void addEquip(User user,int equipId ,List equipList) throws Exception { EquipManager equipManager = user.getEquipManager(); SItem item = SItem.getsItemMap().get(equipId); int itemType = item.getItemType();