diff --git a/Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch index 8fcff4c8b8..53f3071bce 100644 --- a/Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch +++ b/Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch @@ -1,4 +1,4 @@ -From 4fc07207023b06376573d258a25b0fde0dae728e Mon Sep 17 00:00:00 2001 +From e36166b2e930a432e24a30faef537f2a01000315 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 9 Dec 2017 12:40:25 -0500 Subject: [PATCH] Display warning on deprecated recipe API @@ -10,10 +10,10 @@ on the players login. Plugin authors need to define a key to keep it consistent between server restarts. diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index d9af7155..d7fa6d28 100644 +index 398ac245..fc06c7b6 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -@@ -23,6 +23,7 @@ public class ShapedRecipe implements Recipe, Keyed { +@@ -24,6 +24,7 @@ public class ShapedRecipe implements Recipe, Keyed { @Deprecated public ShapedRecipe(ItemStack result) { this.key = NamespacedKey.randomKey(); @@ -22,10 +22,10 @@ index d9af7155..d7fa6d28 100644 } diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index ca5c09b8..f2dd46f2 100644 +index 0c340c84..7d60a0a9 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -@@ -23,6 +23,7 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -25,6 +25,7 @@ public class ShapelessRecipe implements Recipe, Keyed { @Deprecated public ShapelessRecipe(ItemStack result) { this.key = NamespacedKey.randomKey(); diff --git a/work/Bukkit b/work/Bukkit index 5d659aa0e4..f7662d5c92 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 5d659aa0e44dfb8ec758f910f0a4d0d1dcddd614 +Subproject commit f7662d5c9249b90936349d3da43bb0bab089e59e diff --git a/work/CraftBukkit b/work/CraftBukkit index 06112946da..bfb9131494 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 06112946da2e82ed8cbdd5f210f2a3373800181e +Subproject commit bfb9131494176498e2444f7ac69bdc924192ee2e