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

diff --git a/Spigot-Server-Patches/0138-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0138-Disable-Vanilla-Chunk-GC.patch
new file mode 100644
index 0000000000..9b787d98de
--- /dev/null
+++ b/Spigot-Server-Patches/0138-Disable-Vanilla-Chunk-GC.patch
@@ -0,0 +1,32 @@
+From ee210a06121210a6975b810dbbbe28f8f98944d7 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Mon, 26 Sep 2016 01:51:30 -0400
+Subject: [PATCH] Disable Vanilla Chunk GC
+
+Bukkit has its own system for this.
+
+diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
+index 49c5b0b5cc..15736f7575 100644
+--- a/src/main/java/net/minecraft/server/WorldServer.java
++++ b/src/main/java/net/minecraft/server/WorldServer.java
+@@ -872,6 +872,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+             chunkproviderserver.a(flag);
+             timings.worldSaveChunks.stopTiming(); // Paper
+             // CraftBukkit - ArrayList -> Collection
++            /* //Paper start - disable vanilla chunk GC
+             java.util.Collection<Chunk> list = chunkproviderserver.a();
+             Iterator iterator = list.iterator();
+ 
+@@ -881,7 +882,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+                 if (chunk != null && !this.manager.a(chunk.locX, chunk.locZ)) {
+                     chunkproviderserver.unload(chunk);
+                 }
+-            }
++            }*/
++            // Paper end
+             timings.worldSave.stopTiming(); // Paper
+         }
+     }
+-- 
+2.21.0
+