twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 02:02:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add CrafterCraftEvent (#11082)

Browse Source 
Ports the proposed CrafterCraftEvent proposed in an
open upstream PR.

See: https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/pull-requests/1044
This commit is contained in:
Bjarne Koll
2024-07-19 11:21:26 +02:00
parent 870239b8a4
commit 4c38b7496b
2 changed files with 128 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
patches/server/Add-CrafterCraftEvent.patch Normal file
View File

@@ -0,0 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: ploppyperson <nathat890@outlook.com>
Date: Thu, 18 Jul 2024 16:38:48 +0200
Subject: [PATCH] Add CrafterCraftEvent
While not a one-to-one copy from the proposed commit upstream,
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/level/block/CrafterBlock.java b/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
@@ -0,0 +0,0 @@ public class CrafterBlock extends BaseEntityBlock {
} else {
RecipeHolder<CraftingRecipe> recipeHolder = optional.get();
ItemStack itemStack = recipeHolder.value().assemble(var11, world.registryAccess());
+ // Paper start - call CrafterCraftEvent
+ final org.bukkit.event.block.CrafterCraftEvent event = new org.bukkit.event.block.CrafterCraftEvent(
+ org.bukkit.craftbukkit.block.CraftBlock.at(world, pos),
+ (org.bukkit.inventory.CraftingRecipe) recipeHolder.toBukkitRecipe(),
+ org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack)
+ );
+ if (!event.callEvent()) return;
+
+ itemStack = org.bukkit.craftbukkit.inventory.CraftItemStack.unwrap(event.getResult());
+ // Paper end - call CrafterCraftEvent
if (itemStack.isEmpty()) {
world.levelEvent(1050, pos, 0);
} else {