From 9d1ad3c86610cc59bbc4ffec419e7df2f74106bf Mon Sep 17 00:00:00 2001 From: VoidAngel Date: Sun, 29 Apr 2018 11:15:07 -0700 Subject: [PATCH] Removed redundant code --- .../mrCookieSlime/Slimefun/Setup/SlimefunSetup.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index a68243734..2e448335b 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -1889,22 +1889,15 @@ public class SlimefunSetup { if (mb.isMultiBlock(SlimefunItem.getByID("SAW_MILL"))) { if(CSCoreLib.getLib().getProtectionManager().canBuild(p.getUniqueId(), b.getRelative(BlockFace.UP), true)) { if (Slimefun.hasUnlocked(p, SlimefunItems.SAW_MILL, true)) { - if (b.getRelative(BlockFace.UP).getType() == Material.LOG) { + if (b.getRelative(BlockFace.UP).getType() == Material.LOG || b.getRelative(BlockFace.UP).getType() == Material.LOG_2) { Block log = b.getRelative(BlockFace.UP); if(!BlockStorage.hasBlockInfo(log)) { - log.getWorld().dropItemNaturally(log.getLocation(), new CustomItem(Material.WOOD, log.getData() % 4, 8)); + ItemStack item = log.getType() == Material.LOG ? new CustomItem(Material.WOOD, log.getData() % 4, 8) : new CustomItem(Material.WOOD, (log.getData() % 2) + 4, 8); + log.getWorld().dropItemNaturally(log.getLocation(), item); log.getWorld().playEffect(log.getLocation(), Effect.STEP_SOUND, log.getType()); log.setType(Material.AIR); } } - else if (b.getRelative(BlockFace.UP).getType() == Material.LOG_2) { - Block log = b.getRelative(BlockFace.UP); - if(!BlockStorage.hasBlockInfo(log)) { - log.getWorld().dropItemNaturally(log.getLocation(), new CustomItem(Material.WOOD, (log.getData() % 2) + 4, 8)); - log.getWorld().playEffect(log.getLocation(), Effect.STEP_SOUND, log.getType()); - log.setType(Material.AIR); - } - } } } return true;