SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix anvils bug - Fixes #3802

Browse Source
This commit is contained in:
Aikar
2020-07-05 02:25:29 -04:00
parent 1e75e54195
commit 174560824a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Spigot-Server-Patches/Add-PrepareResultEvent.patch
View File

@@ -115,13 +115,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
- public static PrepareAnvilEvent callPrepareAnvilEvent(InventoryView view, ItemStack item) { - public static PrepareAnvilEvent callPrepareAnvilEvent(InventoryView view, ItemStack item) {
- PrepareAnvilEvent event = new PrepareAnvilEvent(view, CraftItemStack.asCraftMirror(item).clone());
- event.getView().getPlayer().getServer().getPluginManager().callEvent(event);
+ // Paper start - disable this method, handled below
+ public static void callPrepareAnvilEvent(InventoryView view, ItemStack item) { // Paper - verify nothing uses return - handled below in PrepareResult + public static void callPrepareAnvilEvent(InventoryView view, ItemStack item) { // Paper - verify nothing uses return - handled below in PrepareResult
+ if (true) return; // Paper - nothing + PrepareAnvilEvent event = new PrepareAnvilEvent(view, CraftItemStack.asCraftMirror(item)); // Paper - remove clone
PrepareAnvilEvent event = new PrepareAnvilEvent(view, CraftItemStack.asCraftMirror(item).clone()); + //event.getView().getPlayer().getServer().getPluginManager().callEvent(event); // disable event
event.getView().getPlayer().getServer().getPluginManager().callEvent(event);
event.getInventory().setItem(2, event.getResult()); event.getInventory().setItem(2, event.getResult());
+ //return event; // Paper + //return event; // Paper
+ } + }
+ // Paper end
+ +
+ // Paper start - support specific overrides for prepare result + // Paper start - support specific overrides for prepare result
+ public static com.destroystokyo.paper.event.inventory.PrepareResultEvent callPrepareResultEvent(InventoryView view, ItemStack item, int resultSlot) { + public static com.destroystokyo.paper.event.inventory.PrepareResultEvent callPrepareResultEvent(InventoryView view, ItemStack item, int resultSlot) {