Upstream
/
UltimateStacker
mirror of https://github.com/songoda/UltimateStacker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

quick fix.

This commit is contained in:
Brianna 2019-07-13 15:49:40 -04:00
parent 5e995da7bd
commit 544cf08309
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/songoda/ultimatestacker/listeners/ItemListeners.java
View File

@ -58,7 +58,7 @@ public class ItemListeners implements Listener {
if (amount <= 32) return;
event.setCancelled(true);
updateInventory(event.getItem(), event.getInventory());
Methods.updateInventory(event.getItem(), event.getInventory());
}
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@ -77,27 +77,7 @@ public class ItemListeners implements Listener {
instance.isServerVersionAtLeast(ServerVersion.V1_9) ? Sound.ENTITY_ITEM_PICKUP
: Sound.valueOf("ITEM_PICKUP"), .2f, (float) (1 + Math.random()));
updateInventory(event.getItem(), event.getPlayer().getInventory());
Methods.updateInventory(event.getItem(), event.getPlayer().getInventory());
}
private void updateInventory(Item item, Inventory inventory) {
int amount = Methods.getActualItemAmount(item);
while (amount > 0) {
int subtract = Math.min(amount, 64);
amount -= subtract;
ItemStack newItem = item.getItemStack().clone();
newItem.setAmount(subtract);
Map<Integer, ItemStack> result = inventory.addItem(newItem);
if (result.get(0) != null) {
amount += result.get(0).getAmount();
break;
}
}
if (amount <= 0)
item.remove();
else
Methods.updateItemAmount(item, amount);
}
}

22
src/main/java/com/songoda/ultimatestacker/utils/Methods.java
View File

@ -9,6 +9,7 @@ import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.block.CreatureSpawner;
import org.bukkit.entity.*;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BlockStateMeta;
import org.bukkit.inventory.meta.ItemMeta;
@ -24,6 +25,27 @@ import java.util.stream.Collectors;
public class Methods {
public static void updateInventory(Item item, Inventory inventory) {
int amount = Methods.getActualItemAmount(item);
while (amount > 0) {
int subtract = Math.min(amount, 64);
amount -= subtract;
ItemStack newItem = item.getItemStack().clone();
newItem.setAmount(subtract);
Map<Integer, ItemStack> result = inventory.addItem(newItem);
if (result.get(0) != null) {
amount += result.get(0).getAmount();
break;
}
}
if (amount <= 0)
item.remove();
else
Methods.updateItemAmount(item, amount);
}
public static void updateItemAmount(Item item, int newAmount) {
UltimateStacker plugin = UltimateStacker.getInstance();
Material material = item.getItemStack().getType();