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

diff --git a/Spigot-Server-Patches/0286-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch b/Spigot-Server-Patches/0286-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
deleted file mode 100644
index a09cd093fa..0000000000
--- a/Spigot-Server-Patches/0286-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 11804fc6af089b140904ea3aaf81757aee10206b Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Thu, 19 Jul 2018 01:23:00 -0400
-Subject: [PATCH] Don't process despawn if entity is in a chunk scheduled for
- unload
-
-This won't happen anyways if the user has
-"skip ticking for entities in chunks scheduled for unload" turned on,
-but if they don't, protect from this instant killing the entity to
-keep it vanilla in behavior
-
-a player may teleport away, and trigger instant despawn
-
-diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 98e214cdd..ee5078370 100644
---- a/src/main/java/net/minecraft/server/EntityInsentient.java
-+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -634,6 +634,8 @@ public abstract class EntityInsentient extends EntityLiving {
-         if (this.persistent) {
-             this.ticksFarFromPlayer = 0;
-         } else {
-+            Chunk currentChunk = getChunkAtLocation(); // Paper
-+            if (currentChunk != null && currentChunk.scheduledForUnload != null) return; // Paper
-             EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
- 
-             if (entityhuman != null && entityhuman.affectsSpawning) { // Paper - Affects Spawning API
--- 
-2.21.0
-