From 340005109bb4262ff2d0f3cee0aba9342fbf28e9 Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Sat, 6 Feb 2021 01:14:23 +0100
Subject: [PATCH] Even more fixes!

---
 .../electric/machines/auto_crafters/AbstractAutoCrafter.java | 4 +++-
 .../electric/machines/auto_crafters/EnhancedRecipe.java      | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java
index 28308fa76..98f271846 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java
@@ -12,6 +12,7 @@ import org.apache.commons.lang.Validate;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
+import org.bukkit.Particle;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -147,6 +148,7 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy
 
                 if (craft(inv, recipe)) {
                     // We are done crafting!
+                    b.getWorld().spawnParticle(Particle.VILLAGER_HAPPY, b.getLocation(), 16);
                     removeCharge(b.getLocation(), getEnergyConsumption());
                 }
             }
@@ -279,7 +281,7 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy
             }
 
             // All Predicates have found a match
-            return true;
+            return inv.addItem(recipe.getResult().clone()).isEmpty();
         }
 
         return false;
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/EnhancedRecipe.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/EnhancedRecipe.java
index 0d7c75923..f8e4c1281 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/EnhancedRecipe.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/EnhancedRecipe.java
@@ -42,7 +42,10 @@ class EnhancedRecipe extends AbstractRecipe {
 
         for (int i = 0; i < 9; i++) {
             ItemStack ingredient = item.getRecipe()[i];
-            predicates.add(stack -> SlimefunUtils.isItemSimilar(stack, ingredient, true));
+
+            if (ingredient != null && !ingredient.getType().isAir()) {
+                predicates.add(stack -> SlimefunUtils.isItemSimilar(stack, ingredient, true));
+            }
         }
 
         return predicates;