diff --git a/patches/server/0519-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0519-Implemented-BlockFailedDispenseEvent.patch index 982bfcf2b3..cbf31d885b 100644 --- a/patches/server/0519-Implemented-BlockFailedDispenseEvent.patch +++ b/patches/server/0519-Implemented-BlockFailedDispenseEvent.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Implemented BlockFailedDispenseEvent diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java -index e66ed3fcfcbabf4b466c1f7988d337b3b7bcd85d..d86a5f80171e13c2b1a1fd90b4c1471fadd957b4 100644 +index e66ed3fcfcbabf4b466c1f7988d337b3b7bcd85d..5cf5b451fecb1ff04d0c4aca1fb0b702c7f99bdf 100644 --- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java +++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java @@ -89,8 +89,10 @@ public class DispenserBlock extends BaseEntityBlock { int i = tileentitydispenser.getRandomSlot(world.random); if (i < 0) { -+ if (orgg.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) {// Paper - BlockFailedDispenseEvent is called here ++ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) { // Paper - BlockFailedDispenseEvent is called here world.levelEvent(1001, pos, 0); world.gameEvent(GameEvent.BLOCK_ACTIVATE, pos, GameEvent.Context.of(tileentitydispenser.getBlockState())); + } // Paper diff --git a/patches/server/0534-Implement-BlockPreDispenseEvent.patch b/patches/server/0534-Implement-BlockPreDispenseEvent.patch index cf53058fba..d181c4d701 100644 --- a/patches/server/0534-Implement-BlockPreDispenseEvent.patch +++ b/patches/server/0534-Implement-BlockPreDispenseEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement BlockPreDispenseEvent diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java -index d86a5f80171e13c2b1a1fd90b4c1471fadd957b4..edcdaac8078d131cffacae25764a1c3c6ad79923 100644 +index 5cf5b451fecb1ff04d0c4aca1fb0b702c7f99bdf..9b1e51c1d95da885c80c6d05000d83436b7bcfb4 100644 --- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java +++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java @@ -98,6 +98,7 @@ public class DispenserBlock extends BaseEntityBlock { diff --git a/patches/server/0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch index 5813774882..5f0bb00e06 100644 --- a/patches/server/0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch +++ b/patches/server/0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch @@ -48,7 +48,7 @@ index 3036abbcf12753a43f520fc2528928cb9849c311..473b3f7aa7ca4d1c4b9e911984bc7b26 return recipe; } diff --git a/src/main/java/net/minecraft/world/item/crafting/SmithingTrimRecipe.java b/src/main/java/net/minecraft/world/item/crafting/SmithingTrimRecipe.java -index e0b24c140e04a159a7b8aaef64ab94e19fc03dfd..6eed194d8bff245b08dc82f1b239bee0cbbdbacf 100644 +index e0b24c140e04a159a7b8aaef64ab94e19fc03dfd..2f26ef211322398e795cbdc75b565fc7922cf4ff 100644 --- a/src/main/java/net/minecraft/world/item/crafting/SmithingTrimRecipe.java +++ b/src/main/java/net/minecraft/world/item/crafting/SmithingTrimRecipe.java @@ -29,8 +29,15 @@ public class SmithingTrimRecipe implements SmithingRecipe { @@ -61,7 +61,7 @@ index e0b24c140e04a159a7b8aaef64ab94e19fc03dfd..6eed194d8bff245b08dc82f1b239bee0 + // Paper start + this(template, base, addition, true); + } -+ public SmithingTrimRecipe(ResourceLocation id, Ingredient template, Ingredient base, Ingredient addition, boolean copyNbt) { ++ public SmithingTrimRecipe(Ingredient template, Ingredient base, Ingredient addition, boolean copyNbt) { + this.copyNbt = copyNbt; + // Paper end this.template = template;