diff options
author | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
---|---|---|
committer | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
commit | a74d9bf629ab2d502831fb36a251cdac0ab30522 (patch) | |
tree | 44af854a258c4f9119f2caa6db257e4e3a1e6e52 /patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch | |
parent | 6723f5498616da919762c68978e13c518943ef40 (diff) | |
parent | 70b0e844767131681400b3dbace06c2dea13f87c (diff) | |
download | Paper-a74d9bf629ab2d502831fb36a251cdac0ab30522.tar.gz Paper-a74d9bf629ab2d502831fb36a251cdac0ab30522.zip |
Merge remote-tracking branch 'origin/master' into chore/terminalchore/terminal
Diffstat (limited to 'patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch')
-rw-r--r-- | patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch index 817b9a2a62..14e94043d2 100644 --- a/patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch +++ b/patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch @@ -22,10 +22,10 @@ index a98fc2ffdae1a2f8f3a312bed95268e105f7f791..91bfeffcdbe47208c7d0ddbe013cd0f1 public static class ExactChoice implements RecipeChoice { diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index 71e494177473c62449aafda1699b26a0c4c81a68..97d5d9c6347bc401e3f4ab7c0ba1391ad5b0449a 100644 +index 1ef513d4d03ce677ee9c77b91e2cc5553ab91e0b..1012656948e9bf2aa18867cc2409616f3f21501e 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -@@ -168,6 +168,13 @@ public class ShapedRecipe extends CraftingRecipe { +@@ -179,6 +179,13 @@ public class ShapedRecipe extends CraftingRecipe { return this; } |