Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2024-11-27 04:25:19 +01:00
Code Issues Projects Releases Wiki Activity

Add max stack size check when pre-stack items with US

Browse Source
This commit is contained in:
ceze88 2022-09-19 21:04:52 +02:00
parent 30d070cade
commit 92c653d9be
1 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Core/src/main/java/com/songoda/core/lootables/loot/DropUtils.java
View File

@ -2,10 +2,13 @@ package com.songoda.core.lootables.loot;
import com.songoda.core.SongodaCore;
import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.settings.Settings;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import java.util.ArrayList;
import java.util.HashMap;
@ -69,21 +72,33 @@ public class DropUtils {
}
private static void dropItems(List<ItemStack> items, EntityDeathEvent event) {
//Pre stack items
if (SongodaCore.isRegistered("UltimateStacker")) {
Map<ItemStack, Integer> stacks = new HashMap<>();
//Check if stacks contains the item, if so update the amount
List<StackedItem> stacks = new ArrayList<>();
for (ItemStack item : items) {
if (stacks.containsKey(item)) {
stacks.put(item, stacks.get(item) + item.getAmount());
} else {
stacks.put(item, item.getAmount());
if (stacks.isEmpty()) {
stacks.add(new StackedItem(item, item.getAmount()));
continue;
}
for (StackedItem stackedItem : stacks) {
if (stackedItem.getMaterial().equals(item.getType())) {
int newAmount = stackedItem.getAmount() + item.getAmount();
int maxSize = Settings.MAX_STACK_ITEMS.getInt();
while (newAmount > maxSize) {
newAmount -= maxSize;
stacks.add(new StackedItem(item, newAmount));
}
if (newAmount > 0) {
stacks.add(new StackedItem(item, newAmount));
}
} else {
stacks.add(new StackedItem(item, item.getAmount()));
}
}
}
//Spawn stacked items by UltimateStacker
for (Map.Entry<ItemStack, Integer> entry : stacks.entrySet()) {
UltimateStacker.spawnStackedItem(entry.getKey(), entry.getValue(), event.getEntity().getLocation());
for (StackedItem stack : stacks) {
UltimateStacker.spawnStackedItem(stack.getItem(), stack.getAmount(), event.getEntity().getLocation());
}
return;
}
for (ItemStack item : items) {
event.getDrops().add(item);
@ -101,4 +116,27 @@ public class DropUtils {
}
}
}
private static class StackedItem {
private final ItemStack item;
private final int amount;
public StackedItem(ItemStack item, int amount) {
this.item = item;
this.amount = amount;
}
public Material getMaterial() {
return item.getType();
}
public ItemStack getItem() {
return item;
}
public int getAmount() {
return amount;
}
}
}