mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Little refractoring, changes req. by TTB
This commit is contained in:
parent
4f762b37b6
commit
f5af271445
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user