diff --git a/nms-patches/CraftingManager.patch b/nms-patches/CraftingManager.patch
index d0100d23b5..d4aa226253 100644
--- a/nms-patches/CraftingManager.patch
+++ b/nms-patches/CraftingManager.patch
@@ -1,5 +1,23 @@
 --- a/net/minecraft/server/CraftingManager.java
 +++ b/net/minecraft/server/CraftingManager.java
+@@ -20,7 +20,7 @@
+     private static final Logger c = LogManager.getLogger();
+     public static final int a = "recipes/".length();
+     public static final int b = ".json".length();
+-    public Map<MinecraftKey, IRecipe> recipes = Maps.newHashMap();
++    public it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap<MinecraftKey, IRecipe> recipes = new it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap<>(); // CraftBukkit
+     private boolean e;
+ 
+     public CraftingManager() {}
+@@ -84,7 +84,7 @@
+         if (this.recipes.containsKey(irecipe.getKey())) {
+             throw new IllegalStateException("Duplicate recipe ignored with ID " + irecipe.getKey());
+         } else {
+-            this.recipes.put(irecipe.getKey(), irecipe);
++            this.recipes.putAndMoveToFirst(irecipe.getKey(), irecipe); // CraftBukkit - SPIGOT-4638: last recipe gets priority
+         }
+     }
+ 
 @@ -95,12 +95,14 @@
  
          do {