Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
0cef14e4 Remove draft API from selectEntities

CraftBukkit Changes:
a46fdbc6 Remove outdated build delay.
3697519b SPIGOT-4708: Fix ExactChoice recipes neglecting material
9ead7009 SPIGOT-4677: Add minecraft.admin.command_feedback permission
c3749a23 Remove the Damage tag from items when it is 0.
f74c7b95 SPIGOT-4706: Can't interact with active item
494eef45 Mention requirement of JIRA ticket for bug fixes
51d62dec SPIGOT-4702: Exception when middle clicking certain slots
be557e69 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN

1 files changed, 35 insertions, 0 deletions

diff --git a/Spigot-Server-Patches/0407-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0407-Fix-PlayerEditBookEvent.patch
new file mode 100644
index 0000000000..0d88970c0f
--- /dev/null
+++ b/Spigot-Server-Patches/0407-Fix-PlayerEditBookEvent.patch
@@ -0,0 +1,35 @@
+From a5eec7e0b987b7adeeb8a9ec29aaa09b003b8860 Mon Sep 17 00:00:00 2001
+From: Michael Himing <[email protected]>
+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 5c041c48fa..f63943f29f 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -823,10 +823,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.getOrCreateTagAndSet("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.21.0
+