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, 35 deletions

diff --git a/Spigot-Server-Patches/0402-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0402-Prevent-rayTrace-from-loading-chunks.patch
deleted file mode 100644
index 2f96260a6b..0000000000
--- a/Spigot-Server-Patches/0402-Prevent-rayTrace-from-loading-chunks.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8aded7fc32eb2d1e7f64a0f98b05ab61371196c8 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Mon, 26 Nov 2018 19:21:58 -0500
-Subject: [PATCH] Prevent rayTrace from loading chunks
-
-ray tracing into an unloaded chunk should be treated as a miss
-this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
-
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b6c602bd0..aa78ccb68 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -860,7 +860,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
-                 int i1 = MathHelper.floor(d1);
-                 int j1 = MathHelper.floor(d2);
-                 BlockPosition blockposition = new BlockPosition(l, i1, j1);
--                IBlockData iblockdata = this.getType(blockposition);
-+                IBlockData iblockdata = this.getTypeIfLoaded(blockposition); // Paper
-+                if (iblockdata == null) return null; // Paper
-                 Fluid fluid = this.getFluid(blockposition);
-                 boolean flag2;
-                 boolean flag3;
-@@ -982,7 +983,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
-                     i1 = MathHelper.floor(d1) - (enumdirection == EnumDirection.UP ? 1 : 0);
-                     j1 = MathHelper.floor(d2) - (enumdirection == EnumDirection.SOUTH ? 1 : 0);
-                     blockposition = new BlockPosition(l, i1, j1);
--                    IBlockData iblockdata1 = this.getType(blockposition);
-+                    IBlockData iblockdata1 = this.getTypeIfLoaded(blockposition); // Paper
-+                    if (iblockdata1 == null) return null; // Paper
-                     Fluid fluid1 = this.getFluid(blockposition);
- 
-                     if (!flag || iblockdata1.getMaterial() == Material.PORTAL || !iblockdata1.getCollisionShape(this, blockposition).isEmpty()) {
--- 
-2.21.0
-