From 75a1f40edcc7717a1ac49c740ffd7e5562fb1027 Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Fri, 19 Jul 2024 19:20:32 +0200 Subject: [PATCH] Rename var --- .../server/1042-Add-CrafterCraftEvent.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/patches/server/1042-Add-CrafterCraftEvent.patch b/patches/server/1042-Add-CrafterCraftEvent.patch index 28eb5f5746732..0081e030a4595 100644 --- a/patches/server/1042-Add-CrafterCraftEvent.patch +++ b/patches/server/1042-Add-CrafterCraftEvent.patch @@ -8,6 +8,25 @@ the patch calls the preemtively pulled CrafterCraftEvent. See: https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/pull-requests/1450/overview +diff --git a/src/main/java/net/minecraft/world/item/crafting/CustomRecipe.java b/src/main/java/net/minecraft/world/item/crafting/CustomRecipe.java +index 50aefbaf4da7f9c6b158c67a6eecfa7b1fabf3cb..69a7e500c725e9da950df30f2cc4ff5f72e527d0 100644 +--- a/src/main/java/net/minecraft/world/item/crafting/CustomRecipe.java ++++ b/src/main/java/net/minecraft/world/item/crafting/CustomRecipe.java +@@ -35,10 +35,10 @@ public abstract class CustomRecipe implements CraftingRecipe { + @Override + public Recipe toBukkitRecipe(NamespacedKey id) { + // Paper - make CraftComplexRecipe extend CraftingRecipe - start +- final org.bukkit.craftbukkit.inventory.CraftComplexRecipe inventory = new org.bukkit.craftbukkit.inventory.CraftComplexRecipe(id, this); +- inventory.setGroup(this.getGroup()); +- inventory.setCategory(org.bukkit.craftbukkit.inventory.CraftRecipe.getCategory(this.category())); +- return inventory; ++ final org.bukkit.craftbukkit.inventory.CraftComplexRecipe recipe = new org.bukkit.craftbukkit.inventory.CraftComplexRecipe(id, this); ++ recipe.setGroup(this.getGroup()); ++ recipe.setCategory(org.bukkit.craftbukkit.inventory.CraftRecipe.getCategory(this.category())); ++ return recipe; + // Paper - make CraftComplexRecipe extend CraftingRecipe - end + } + // CraftBukkit end diff --git a/src/main/java/net/minecraft/world/level/block/CrafterBlock.java b/src/main/java/net/minecraft/world/level/block/CrafterBlock.java index 6c24b25a7c8ce6e34aceb5702f1a0a6732ebca44..391a6af36d4c27a04000b31583297a25b89125d3 100644 --- a/src/main/java/net/minecraft/world/level/block/CrafterBlock.java