Skip to content

Commit 4682013

Browse files
committed
Fixed so the dublicates ignore air
1 parent cbdb222 commit 4682013

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

Menu Configuration Manager/src/main/java/org/broken/arrow/library/menu/button/manager/utility/MenuButtonData.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ public static MenuButtonData deserialize(final Map<String, Object> map) {
168168
buttons.put("passive", map);
169169
}
170170

171-
System.out.println("buttons keySet " + buttons.keySet());
172-
System.out.println("buttons values" + buttons.values());
173171
Map<String, MenuButton> resolveCustomButton = new HashMap<>();
174172
if (!buttons.isEmpty()) {
175173
buttons.forEach((key, value) -> resolveCustomButton.put(key, MenuButton.deserialize(value)));

Menu Library/src/main/java/org/broken/arrow/library/menu/CheckItemsInsideMenu.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -242,16 +242,11 @@ private Map<Integer, ItemStack> addToMuchItems(final Map<Integer, ItemStack> ite
242242
final Set<ItemStack> set = new HashSet<>();
243243
this.sendMsgPlayer = false;
244244
for (final Map.Entry<Integer, ItemStack> entity : items.entrySet()) {
245-
if (entity.getValue() != null) {
246-
/* if (entity.getValue().getAmount() > 1) {
247-
//cachedDuplicatedItems.put(ItemCreator.createItemStackAsOne(entity.getValue()), (ItemCreator.countItemStacks(entity.getValue(), itemStacks)) - 1);
248-
duplicatedItems.computeIfAbsent(player.getUniqueId(), uuid -> new ItemOverflowBatch()).putItem(entity.getValue());
249-
}
250-
*/
251-
//cachedDuplicatedItems.put(ItemCreator.createItemStackAsOne(entity.getValue()), (ItemCreator.countItemStacks(entity.getValue(), itemStacks)) - 1);
252-
duplicatedItems.computeIfAbsent(player.getUniqueId(), uuid -> new ItemOverflowBatch()).putItem(entity.getValue());
253-
if (set.add(ItemCreator.createItemStackAsOne(entity.getValue())))
254-
itemStacksNoDoubleEntity.put(entity.getKey(), ItemCreator.createItemStackAsOne(entity.getValue()));
245+
ItemStack stack = entity.getValue();
246+
if (stack != null && stack.getType() != Material.AIR) {
247+
duplicatedItems.computeIfAbsent(player.getUniqueId(), uuid -> new ItemOverflowBatch()).putItem(stack);
248+
if (set.add(ItemCreator.createItemStackAsOne(stack)))
249+
itemStacksNoDoubleEntity.put(entity.getKey(), ItemCreator.createItemStackAsOne(stack));
255250
}
256251
}
257252
addItemsBackToPlayer(location);

0 commit comments

Comments
 (0)