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

More bug fixes

Browse Source
This commit is contained in:
TheBusyBiscuit 2021-02-06 01:06:11 +01:00
parent dd9a04fe04
commit 1e9e8be82a
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java
View File

@ -106,6 +106,9 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy
return e -> e.getClickedBlock().ifPresent(b -> { return e -> e.getClickedBlock().ifPresent(b -> {
Player p = e.getPlayer(); Player p = e.getPlayer();
// Prevent blocks from being placed, food from being eaten, etc...
e.cancel();
if (SlimefunPlugin.getProtectionManager().hasPermission(p, b, ProtectableAction.INTERACT_BLOCK)) { if (SlimefunPlugin.getProtectionManager().hasPermission(p, b, ProtectableAction.INTERACT_BLOCK)) {
if (p.isSneaking()) { if (p.isSneaking()) {
// Select a new recipe // Select a new recipe

5
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/EnhancedRecipe.java
View File

@ -58,4 +58,9 @@ class EnhancedRecipe extends AbstractRecipe {
} }
} }
@Override
public String toString() {
return item.getId();
}
} }

10
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/VanillaRecipe.java
View File

@ -7,6 +7,7 @@ import java.util.function.Predicate;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import org.bukkit.Keyed;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Recipe; import org.bukkit.inventory.Recipe;
import org.bukkit.inventory.RecipeChoice; import org.bukkit.inventory.RecipeChoice;
@ -96,4 +97,13 @@ class VanillaRecipe extends AbstractRecipe {
} }
} }
@Override
public String toString() {
if (recipe instanceof Keyed) {
return ((Keyed) recipe).getKey().toString();
} else {
return "invalid-recipe";
}
}
} }