Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-06-22 12:24:46 +02:00
Code Issues Projects Releases Wiki Activity

Cleanup: 0-sized arrays, NPE, Math.min usage

Browse Source
This commit is contained in:
Phoenix616 2023-03-01 17:48:07 +01:00
parent fbfe789bfa
commit ada8cf3ae8
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/Acrobot/ChestShop/Listeners/PreTransaction/PartialTransactionModule.java
View File

@ -211,10 +211,10 @@ public class PartialTransactionModule implements Listener {
int amount = InventoryUtil.getAmount(item, inventory);
Collections.addAll(toReturn, getCountedItemStack(new ItemStack[]{item},
amount > item.getAmount() ? item.getAmount() : amount));
Math.min(amount, item.getAmount())));
}
return toReturn.toArray(new ItemStack[toReturn.size()]);
return toReturn.toArray(new ItemStack[0]);
}
private static ItemStack[] getCountedItemStack(ItemStack[] stock, int numberOfItems) {
@ -263,7 +263,7 @@ public class PartialTransactionModule implements Listener {
}
}
return stacks.toArray(new ItemStack[stacks.size()]);
return stacks.toArray(new ItemStack[0]);
}
/**
@ -283,7 +283,9 @@ public class PartialTransactionModule implements Listener {
int free = 0;
for (ItemStack itemInInventory : inventory.getContents()) {
if (MaterialUtil.equals(item, itemInInventory)) {
free += (maxStackSize - itemInInventory.getAmount()) % maxStackSize;
if (itemInInventory != null) {
free += (maxStackSize - itemInInventory.getAmount()) % maxStackSize;
}
}
}
@ -307,6 +309,6 @@ public class PartialTransactionModule implements Listener {
Collections.addAll(resultStock, InventoryUtil.getItemsStacked(item));
}
return resultStock.toArray(new ItemStack[resultStock.size()]);
return resultStock.toArray(new ItemStack[0]);
}
}