Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2025-01-27 01:31:20 +01:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Brianna O'Keefe 2018-11-10 01:02:59 -05:00
parent 40ae065e7f
commit c15a80f66b
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
View File

@ -112,12 +112,10 @@ public class UltimateStacker extends JavaPlugin {
mobFile.saveConfig(); mobFile.saveConfig();
for (Material value : Material.values()) { for (Material value : Material.values()) {
if (!value.isBlock()) {
itemFile.getConfig().addDefault("Items." + value.name() + ".Has Hologram", true); itemFile.getConfig().addDefault("Items." + value.name() + ".Has Hologram", true);
itemFile.getConfig().addDefault("Items." + value.name() + ".Max Stack Size", -1); itemFile.getConfig().addDefault("Items." + value.name() + ".Max Stack Size", -1);
itemFile.getConfig().addDefault("Items." + value.name() + ".Display Name", TextComponent.formatText(value.name().toLowerCase().replace("_", " "), true)); itemFile.getConfig().addDefault("Items." + value.name() + ".Display Name", TextComponent.formatText(value.name().toLowerCase().replace("_", " "), true));
} }
}
itemFile.getConfig().options().copyDefaults(true); itemFile.getConfig().options().copyDefaults(true);
itemFile.saveConfig(); itemFile.saveConfig();

13
src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java
View File

@ -63,8 +63,11 @@ public class StackingTask extends BukkitRunnable {
if (entityO.isCustomNameVisible() && !entityO.getCustomName().contains(TextComponent.convertToInvisibleString("IS")) || item.hasItemMeta() && item.getItemMeta().hasDisplayName()) if (entityO.isCustomNameVisible() && !entityO.getCustomName().contains(TextComponent.convertToInvisibleString("IS")) || item.hasItemMeta() && item.getItemMeta().hasDisplayName())
continue; continue;
if (item.getMaxStackSize() != maxItemStackSize && item.getMaxStackSize() != 1 && (!item.hasItemMeta() || !item.getItemMeta().hasDisplayName())) int specific = instance.getItemFile().getConfig().getInt("Items." + item.getType().name() + ".Max Stack Size");
setMax(item, false); int max = specific == -1 ? maxItemStackSize : specific;
if (item.getMaxStackSize() != max && item.getMaxStackSize() != 1 && (!item.hasItemMeta() || !item.getItemMeta().hasDisplayName()))
setMax(item, max, false);
int size = item.getAmount(); int size = item.getAmount();
@ -136,12 +139,10 @@ public class StackingTask extends BukkitRunnable {
} }
} }
public ItemStack setMax(ItemStack item, boolean reset) { public ItemStack setMax(ItemStack item, int max, boolean reset) {
try { try {
int specific = instance.getItemFile().getConfig().getInt("Items." + item.getType().name() + ".Max Stack Size");
int maxItemStackSize = specific == -1 ? instance.getConfig().getInt("Item.Max Stack Size") : specific;
Object objItemStack = methodGetItem.invoke(methodAsNMSCopy.invoke(null, item)); Object objItemStack = methodGetItem.invoke(methodAsNMSCopy.invoke(null, item));
fieldMaxStackSize.set(objItemStack, reset ? new ItemStack(item.getType()).getMaxStackSize() : maxItemStackSize); fieldMaxStackSize.set(objItemStack, reset ? new ItemStack(item.getType()).getMaxStackSize() : max);
} catch (ReflectiveOperationException e) { } catch (ReflectiveOperationException e) {
e.printStackTrace(); e.printStackTrace();
} }