diff --git a/Spigot-Server-Patches/0415-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0415-Fix-PlayerEditBookEvent.patch new file mode 100644 index 0000000000..602da0dd7d --- /dev/null +++ b/Spigot-Server-Patches/0415-Fix-PlayerEditBookEvent.patch @@ -0,0 +1,35 @@ +From 0c0ee91d52bacd3d616fedf173cf2684a90d4c50 Mon Sep 17 00:00:00 2001 +From: Michael Himing +Date: Sun, 16 Dec 2018 13:07:33 +1100 +Subject: [PATCH] Fix PlayerEditBookEvent + +- Updating book writing (not signing) mutated the original item, making +it impossible to properly cancel the event or modify the book meta + +- When the event was cancelled, the client's book would keep the +cancelled writing + +diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java +index 74c570615..616dbb152 100644 +--- a/src/main/java/net/minecraft/server/PlayerConnection.java ++++ b/src/main/java/net/minecraft/server/PlayerConnection.java +@@ -816,10 +816,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { + + this.player.setSlot(enumitemslot, CraftEventFactory.handleEditBookEvent(player, enumitemslot, itemstack1, itemstack2)); // CraftBukkit + } else { +- ItemStack old = itemstack1.cloneItemStack(); // CraftBukkit +- itemstack1.a("pages", (NBTBase) itemstack.getTag().getList("pages", 8)); +- CraftEventFactory.handleEditBookEvent(player, enumitemslot, old, itemstack1); // CraftBukkit ++ // Paper start - dont mutate players current item, set it from the event ++ ItemStack newBook = itemstack1.cloneItemStack(); ++ newBook.a("pages", (NBTBase) itemstack.getTag().getList("pages", 8)); ++ this.player.setSlot(enumitemslot, CraftEventFactory.handleEditBookEvent(player, enumitemslot, itemstack1, newBook)); ++ // Paper end + } ++ player.getBukkitEntity().updateInventory(); // Paper - fix client desync when event is cancelled + } + + } +-- +2.20.1 +