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, 40 insertions, 0 deletions

diff --git a/Spigot-Server-Patches/0260-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0260-ItemStack-getMaxItemUseDuration.patch
new file mode 100644
index 0000000000..5692802ec5
--- /dev/null
+++ b/Spigot-Server-Patches/0260-ItemStack-getMaxItemUseDuration.patch
@@ -0,0 +1,40 @@
+From c386a2b894d68b0d9cc0cd0710b616de0585cf4b Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Tue, 5 Jun 2018 23:00:29 -0400
+Subject: [PATCH] ItemStack#getMaxItemUseDuration
+
+Allows you to determine how long it takes to use a usable/consumable item
+
+diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
+index 927394333a..c1b6eb52bf 100644
+--- a/src/main/java/net/minecraft/server/ItemStack.java
++++ b/src/main/java/net/minecraft/server/ItemStack.java
+@@ -548,6 +548,7 @@ public final class ItemStack {
+         this.getItem().b(this, world, entityhuman);
+     }
+ 
++    public int getItemUseMaxDuration() { return k(); } // Paper - OBFHELPER
+     public int k() {
+         return this.getItem().c(this);
+     }
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+index 69faeb9c09..bc8fb28163 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+@@ -184,6 +184,13 @@ public final class CraftItemStack extends ItemStack {
+         return (handle == null) ? Material.AIR.getMaxStackSize() : handle.getItem().getMaxStackSize();
+     }
+ 
++    // Paper start
++    @Override
++    public int getMaxItemUseDuration() {
++        return handle == null ? 0 : handle.getItemUseMaxDuration();
++    }
++    // Paper end
++
+     @Override
+     public void addUnsafeEnchantment(Enchantment ench, int level) {
+         Validate.notNull(ench, "Cannot add null enchantment");
+-- 
+2.21.0
+