From f5af271445587f8a9469f460da00d40db7433e6c Mon Sep 17 00:00:00 2001 From: CURVX Date: Thu, 22 Oct 2020 23:58:54 +0530 Subject: [PATCH] Little refractoring, changes req. by TTB --- .../listeners/crafting/BrewingStandListener.java | 6 ++---- .../listeners/crafting/SlimefunCraftingListener.java | 9 ++------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/BrewingStandListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/BrewingStandListener.java index 6a0a9bdcf..6e6044234 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/BrewingStandListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/BrewingStandListener.java @@ -55,10 +55,8 @@ public class BrewingStandListener implements SlimefunCraftingListener { @EventHandler public void hopperOnBrew(InventoryMoveItemEvent e) { - if (e.getDestination().getType().equals(InventoryType.BREWING)) { - if (isUnallowed(SlimefunItem.getByItem(e.getItem()))) { - e.setCancelled(true); - } + if (e.getDestination().getType() == InventoryType.BREWING && isUnallowed(e.getItem())) { + e.setCancelled(true); } } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SlimefunCraftingListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SlimefunCraftingListener.java index 6fdba5ab0..fa0763228 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SlimefunCraftingListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SlimefunCraftingListener.java @@ -17,13 +17,8 @@ interface SlimefunCraftingListener extends Listener { } else { SlimefunItem sfItem1 = SlimefunItem.getByItem(item1); SlimefunItem sfItem2 = SlimefunItem.getByItem(item2); - - if (isUnallowed(sfItem1) || isUnallowed(sfItem2)) { - return true; - } + return isUnallowed(sfItem1) || isUnallowed(sfItem2); } - - return false; } default boolean isUnallowed(@Nullable ItemStack item) { @@ -32,7 +27,7 @@ interface SlimefunCraftingListener extends Listener { } SlimefunItem sfItem = SlimefunItem.getByItem(item); - return !(sfItem instanceof VanillaItem) && !sfItem.isDisabled(); + return sfItem != null && !(sfItem instanceof VanillaItem) && !sfItem.isDisabled(); } default boolean isUnallowed(@Nullable SlimefunItem item) {