mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Little refractoring, changes req. by TTB

Browse Source
This commit is contained in:
CURVX 2020-10-22 23:58:54 +05:30
parent 4f762b37b6
commit f5af271445
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/BrewingStandListener.java
View File

@ -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);
}
}
}

9
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SlimefunCraftingListener.java
View File

@ -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) {