From 092d79dda7c770a376a0b73a8febedc46933d349 Mon Sep 17 00:00:00 2001 From: Sniddunc Date: Sat, 24 Nov 2018 01:19:24 -0500 Subject: [PATCH 1/3] Fixed Sawmill Bug where only 1 item was dropped --- src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index 8577af01e..bc5b4df69 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -1904,7 +1904,7 @@ public class SlimefunSetup { if (MaterialHelper.isLog(b.getRelative(BlockFace.UP).getType())) { Block log = b.getRelative(BlockFace.UP); if (!BlockStorage.hasBlockInfo(log)) { - ItemStack item = new CustomItem(MaterialHelper.getWoodFromLog(log.getType()), 8); + ItemStack item = new CustomItem(MaterialHelper.getWoodFromLog(log.getType()), 0, 8); log.getWorld().dropItemNaturally(log.getLocation(), item); log.getWorld().playEffect(log.getLocation(), Effect.STEP_SOUND, log.getType()); log.setType(Material.AIR); From 442a92c24748c07cd87099de92d927ab3fe2e99b Mon Sep 17 00:00:00 2001 From: Sniddunc Date: Sat, 24 Nov 2018 03:24:31 -0500 Subject: [PATCH 2/3] Fixed a Furnace bug where the item did not smelt and the GUI repeated off the screen. --- .../Slimefun/Objects/SlimefunItem/EnhancedFurnace.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java index 69e3a0a2e..7d9505c58 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java @@ -6,6 +6,7 @@ import me.mrCookieSlime.Slimefun.Lists.Categories; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers.BlockTicker; +import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.block.Furnace; import org.bukkit.inventory.ItemStack; @@ -24,12 +25,16 @@ public class EnhancedFurnace extends SlimefunItem { addItemHandler(new BlockTicker() { @Override public void tick(Block b, SlimefunItem item, Config data) { - if (b.getState() instanceof Furnace) + if (b.getState() instanceof Furnace) { if (((Furnace) b.getState()).getCookTime() > 0) { Furnace furnace = (Furnace) b.getState(); - furnace.setCookTime((short) (furnace.getCookTime() + getSpeed() * 10)); + + if ((furnace.getCookTime() + getSpeed() * 10) > 200) furnace.setCookTime((short) 188); + else furnace.setCookTime((short) (furnace.getCookTime() + getSpeed() * 10)); + furnace.update(true, false); } + } } @Override From b83f64a0a778186b81052f805e1f1f0b39796fbd Mon Sep 17 00:00:00 2001 From: Sniddunc Date: Sat, 24 Nov 2018 03:39:20 -0500 Subject: [PATCH 3/3] Fixed a Furnace bug where the item did not smelt and the GUI repeated off the screen. --- .../Slimefun/Objects/SlimefunItem/EnhancedFurnace.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java index 7d9505c58..84a5bd570 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java @@ -29,8 +29,10 @@ public class EnhancedFurnace extends SlimefunItem { if (((Furnace) b.getState()).getCookTime() > 0) { Furnace furnace = (Furnace) b.getState(); - if ((furnace.getCookTime() + getSpeed() * 10) > 200) furnace.setCookTime((short) 188); - else furnace.setCookTime((short) (furnace.getCookTime() + getSpeed() * 10)); + int newCookTime = furnace.getCookTime() + getSpeed() * 10; + + if (newCookTime > 200) furnace.setCookTime((short) 188); + else furnace.setCookTime((short) newCookTime); furnace.update(true, false); }