aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0400-Add-PrepareResultEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0400-Add-PrepareResultEvent.patch')
-rw-r--r--patches/server/0400-Add-PrepareResultEvent.patch165
1 files changed, 165 insertions, 0 deletions
diff --git a/patches/server/0400-Add-PrepareResultEvent.patch b/patches/server/0400-Add-PrepareResultEvent.patch
new file mode 100644
index 0000000000..8426a573bd
--- /dev/null
+++ b/patches/server/0400-Add-PrepareResultEvent.patch
@@ -0,0 +1,165 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <[email protected]>
+Date: Fri, 3 Jul 2020 11:58:56 -0500
+Subject: [PATCH] Add PrepareResultEvent
+
+Adds a new event for all crafting stations that generate a result slot item
+
+Anvil, Grindstone and Smithing now extend this event
+
+diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+index 878d3c3089635a515fa7f54c956159a1bb6ce29b..cab3e0ba471c93764b5949ad68a0f2cce4d00099 100644
+--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+@@ -338,6 +338,7 @@ public class AnvilMenu extends ItemCombinerMenu {
+ }
+
+ this.createResult();
++ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, RESULT_SLOT); // Paper - Add PrepareResultEvent
+ return true;
+ } else {
+ return false;
+diff --git a/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java b/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
+index fe1ce65b35e83ee0ada77e44b080729346bb3c2d..ca3c8b31967a6efd7b0caacb091ab2151e7c0bee 100644
+--- a/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
+@@ -150,6 +150,7 @@ public class CartographyTableMenu extends AbstractContainerMenu {
+ this.setupResultSlot(itemstack, itemstack1, itemstack2);
+ }
+
++ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, RESULT_SLOT); // Paper - Add PrepareResultEvent
+ }
+
+ private void setupResultSlot(ItemStack map, ItemStack item, ItemStack oldResult) {
+diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+index 45242f0ed5a0f98953df5f27fb76874d2d9e3473..1783661f38a6f5fb655ea83953b9467bd91a1302 100644
+--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+@@ -159,6 +159,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
+ super.slotsChanged(inventory);
+ if (inventory == this.repairSlots) {
+ this.createResult();
++ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, RESULT_SLOT); // Paper - Add PrepareResultEvent
+ }
+
+ }
+diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
+index 4087e381b2250be387b608d8742f6a6009a52879..eb36a69b8da492aec9609cc9ef80d7d68ff9af03 100644
+--- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
+@@ -110,6 +110,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
+ super.slotsChanged(inventory);
+ if (inventory == this.inputSlots) {
+ this.createResult();
++ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, this instanceof SmithingMenu ? 3 : 2); // Paper - Add PrepareResultEvent
+ }
+
+ }
+diff --git a/src/main/java/net/minecraft/world/inventory/LoomMenu.java b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
+index 5c209a3d81db5326f63c506077fa0bfd241b4b12..a98157f600837898dd8ef12671c4bb713e30f30c 100644
+--- a/src/main/java/net/minecraft/world/inventory/LoomMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
+@@ -248,7 +248,8 @@ public class LoomMenu extends AbstractContainerMenu {
+ this.resultSlot.set(ItemStack.EMPTY);
+ }
+
+- this.broadcastChanges();
++ // this.broadcastChanges(); // Paper - Add PrepareResultEvent; done below
++ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, 3); // Paper - Add PrepareResultEvent
+ } else {
+ this.resultSlot.set(ItemStack.EMPTY);
+ this.selectablePatterns = List.of();
+diff --git a/src/main/java/net/minecraft/world/inventory/SmithingMenu.java b/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
+index 59d9f990a87ab5214fa51e3a6e933bf5ae71b613..1e9e70263996afa294458364aa70e738b5aabea1 100644
+--- a/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
+@@ -115,6 +115,7 @@ public class SmithingMenu extends ItemCombinerMenu {
+ }
+ }
+
++ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, RESULT_SLOT); // Paper - Add PrepareResultEvent
+ }
+
+ @Override
+diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
+index 9c2fe69ced7a46bbd8b0fbe10fa67d0a39b0f375..e40d9dbdbe5359c38af6d764d01c9be422654aaa 100644
+--- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
+@@ -181,6 +181,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
+ this.setupRecipeList(inventory, itemstack);
+ }
+
++ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareResultEvent(this, RESULT_SLOT); // Paper - Add PrepareResultEvent
+ }
+
+ private void setupRecipeList(Container input, ItemStack stack) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index 0a169b4cf47ff3d05555af6c0e0b0cdb30ba9e45..67bfd38bd08c30eae597a4875ea4a8b26c2f5c5a 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1647,6 +1647,12 @@ public class CraftEventFactory {
+ }
+
+ public static PrepareAnvilEvent callPrepareAnvilEvent(InventoryView view, ItemStack item) {
++ // Paper start - Add PrepareResultEvent
++ if (true) {
++ view.getTopInventory().setItem(net.minecraft.world.inventory.AnvilMenu.RESULT_SLOT, CraftItemStack.asCraftMirror(item));
++ return null; // verify nothing uses return - disable event: handled below in PrepareResult
++ }
++ // Paper end - Add PrepareResultEvent
+ PrepareAnvilEvent event = new PrepareAnvilEvent(view, CraftItemStack.asCraftMirror(item).clone());
+ event.getView().getPlayer().getServer().getPluginManager().callEvent(event);
+ event.getInventory().setItem(2, event.getResult());
+@@ -1654,6 +1660,12 @@ public class CraftEventFactory {
+ }
+
+ public static PrepareGrindstoneEvent callPrepareGrindstoneEvent(InventoryView view, ItemStack item) {
++ // Paper start - Add PrepareResultEvent
++ if (true) {
++ view.getTopInventory().setItem(net.minecraft.world.inventory.GrindstoneMenu.RESULT_SLOT, CraftItemStack.asCraftMirror(item));
++ return null; // verify nothing uses return - disable event: handled below in PrepareResult
++ }
++ // Paper end - Add PrepareResultEvent
+ PrepareGrindstoneEvent event = new PrepareGrindstoneEvent(view, CraftItemStack.asCraftMirror(item).clone());
+ event.getView().getPlayer().getServer().getPluginManager().callEvent(event);
+ event.getInventory().setItem(2, event.getResult());
+@@ -1661,12 +1673,39 @@ public class CraftEventFactory {
+ }
+
+ public static PrepareSmithingEvent callPrepareSmithingEvent(InventoryView view, ItemStack item) {
++ // Paper start - Add PrepareResultEvent
++ if (true) {
++ view.getTopInventory().setItem(net.minecraft.world.inventory.SmithingMenu.RESULT_SLOT, CraftItemStack.asCraftMirror(item));
++ return null; // verify nothing uses return - disable event: handled below in PrepareResult
++ }
++ // Paper end - Add PrepareResultEvent
+ PrepareSmithingEvent event = new PrepareSmithingEvent(view, CraftItemStack.asCraftMirror(item).clone());
+ event.getView().getPlayer().getServer().getPluginManager().callEvent(event);
+ event.getInventory().setResult(event.getResult());
+ return event;
+ }
+
++ // Paper start - Add PrepareResultEvent
++ public static void callPrepareResultEvent(AbstractContainerMenu container, int resultSlot) {
++ final com.destroystokyo.paper.event.inventory.PrepareResultEvent event;
++ InventoryView view = container.getBukkitView();
++ org.bukkit.inventory.ItemStack origItem = view.getTopInventory().getItem(resultSlot);
++ CraftItemStack result = origItem != null ? CraftItemStack.asCraftCopy(origItem) : null;
++ if (view.getTopInventory() instanceof org.bukkit.inventory.AnvilInventory) {
++ event = new PrepareAnvilEvent(view, result);
++ } else if (view.getTopInventory() instanceof org.bukkit.inventory.GrindstoneInventory) {
++ event = new PrepareGrindstoneEvent(view, result);
++ } else if (view.getTopInventory() instanceof org.bukkit.inventory.SmithingInventory) {
++ event = new PrepareSmithingEvent(view, result);
++ } else {
++ event = new com.destroystokyo.paper.event.inventory.PrepareResultEvent(view, result);
++ }
++ event.callEvent();
++ event.getInventory().setItem(resultSlot, event.getResult());
++ container.broadcastChanges();;
++ }
++ // Paper end - Add PrepareResultEvent
++
+ /**
+ * Mob spawner event.
+ */