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

Spawners fix

This commit is contained in:
Brianna O'Keefe 2018-11-05 23:53:27 -05:00
parent 116442a51e
commit ede59bf3bc
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ public class UltimateStacker extends JavaPlugin {
settingsManager.updateSettings(); settingsManager.updateSettings();
for (EntityType value : EntityType.values()) { for (EntityType value : EntityType.values()) {
if (value.isSpawnable() && value.isAlive() && !value.toString().toLowerCase().contains("armor")) { if (value.isSpawnable() && value.isAlive() && !value.toString().contains("ARMOR")) {
mobFile.getConfig().addDefault("Mobs." + value.name() + ".Enabled", true); mobFile.getConfig().addDefault("Mobs." + value.name() + ".Enabled", true);
mobFile.getConfig().addDefault("Mobs." + value.name() + ".Max Stack Size", -1); mobFile.getConfig().addDefault("Mobs." + value.name() + ".Max Stack Size", -1);
} }
@ -100,7 +100,7 @@ public class UltimateStacker extends JavaPlugin {
itemFile.saveConfig(); itemFile.saveConfig();
for (EntityType value : EntityType.values()) { for (EntityType value : EntityType.values()) {
if (value.isSpawnable() && value.isAlive() && !value.toString().toLowerCase().contains("armor")) { if (value.isSpawnable() && value.isAlive() && !value.toString().contains("ARMOR")) {
spawnerFile.getConfig().addDefault("Spawners." + value.name() + ".Max Stack Size", -1); spawnerFile.getConfig().addDefault("Spawners." + value.name() + ".Max Stack Size", -1);
spawnerFile.getConfig().addDefault("Spawners." + value.name() + ".Display Name", TextComponent.formatText(value.name().toLowerCase().replace("_", " "), true)); spawnerFile.getConfig().addDefault("Spawners." + value.name() + ".Display Name", TextComponent.formatText(value.name().toLowerCase().replace("_", " "), true));
} }
@ -320,6 +320,10 @@ public class UltimateStacker extends JavaPlugin {
return itemFile; return itemFile;
} }
public ConfigWrapper getSpawnerFile() {
return spawnerFile;
}
public static UltimateStacker getInstance() { public static UltimateStacker getInstance() {
return INSTANCE; return INSTANCE;
} }

9
src/main/java/com/songoda/ultimatestacker/events/BlockListeners.java
View File

@ -45,7 +45,7 @@ public class BlockListeners implements Listener {
EntityType itemType = cs.getSpawnedType(); EntityType itemType = cs.getSpawnedType();
int itemAmount = getSpawnerAmount(item); int itemAmount = getSpawnerAmount(item);
int specific = instance.getItemFile().getConfig().getInt("Spawners." + itemType.name() + ".Max Stack Size"); int specific = instance.getSpawnerFile().getConfig().getInt("Spawners." + cs.getSpawnedType().name() + ".Max Stack Size");
int maxStackSize = specific == -1 ? instance.getConfig().getInt("Spawners.Max Stack Size") : specific; int maxStackSize = specific == -1 ? instance.getConfig().getInt("Spawners.Max Stack Size") : specific;
cs = (CreatureSpawner)block.getState(); cs = (CreatureSpawner)block.getState();
@ -72,10 +72,10 @@ public class BlockListeners implements Listener {
stack.setAmount(stack.getAmount() + itemAmount); stack.setAmount(stack.getAmount() + itemAmount);
instance.getHologramHandler().updateHologram(stack); instance.getHologramHandler().updateHologram(stack);
Methods.takeItem(player, itemAmount);
} }
} }
Methods.takeItem(player, itemAmount);
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(instance, () -> instance.getHologramHandler().processChange(block), 10L); Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(instance, () -> instance.getHologramHandler().processChange(block), 10L);
@ -135,10 +135,11 @@ public class BlockListeners implements Listener {
} }
public int getSpawnerAmount(ItemStack item) { private int getSpawnerAmount(ItemStack item) {
if (!item.hasItemMeta() || !item.getItemMeta().hasDisplayName()) return 1; if (!item.hasItemMeta() || !item.getItemMeta().hasDisplayName()) return 1;
if (item.getItemMeta().getDisplayName().contains(":")) { if (item.getItemMeta().getDisplayName().contains(":")) {
return NumberUtils.toInt(item.getItemMeta().getDisplayName().replace("\u00A7", "").split(":")[0], 0); int amt = NumberUtils.toInt(item.getItemMeta().getDisplayName().replace("\u00A7", "").split(":")[0], 1);
return amt == 0 ? 1 : amt;
} }
return 1; return 1;
} }