Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
14513c3c Updated Upstream (Bukkit/CraftBukkit)

patches/api/0006-Add-ExecuteCommandEvent.patch

@@ -1,4 +1,4 @@
-From 7ed154e449e138a75afd69e67f0752ed8350486f Mon Sep 17 00:00:00 2001
+From b83812676462910150c6547ac1e5249c10cb5783 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 00:08:28 -0500
 Subject: [PATCH] Add ExecuteCommandEvent
@@ -179,5 +179,5 @@ index 460fda05a..1e0eb0999 100644
          } catch (CommandException ex) {
              server.getPluginManager().callEvent(new ServerExceptionEvent(new ServerCommandException(ex, target, sender, args))); // Paper
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0006-Add-village-raid-spawn-reason.patch

@@ -1,29 +0,0 @@
-From 2fae1badaf27a72abd830879c8624fddbc749eb3 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Wed, 29 May 2019 23:38:50 -0500
-Subject: [PATCH] Add village raid spawn reason
-
----
- .../java/org/bukkit/event/entity/CreatureSpawnEvent.java    | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-index 17aa6722b..323322510 100644
---- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-@@ -95,6 +95,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
-          * When a zombie is spawned to invade a village
-          */
-         VILLAGE_INVASION,
-+        // Purpur start
-+        /**
-+         * When an entity is spawned to raid a village
-+         */
-+        VILLAGE_RAID,
-+        // Purpur end
-         /**
-          * When an animal breeds to create a child
-          */
--- 
-2.20.1
-

patches/api/0007-Advancement-API-Additions.patch

@@ -1,4 +1,4 @@
-From a6b15c0844a089b5b6644d49d5729d24de7dcafc Mon Sep 17 00:00:00 2001
+From 2f34a563b865b3e42ba0050a783f727cab88bd06 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:21 -0500
 Subject: [PATCH] Advancement API Additions
@@ -121,5 +121,5 @@ index 000000000..d1757f3d4
 +    }
 +}
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0008-Implement-ItemFactory-getMonsterEgg.patch

@@ -1,4 +1,4 @@
-From 7ed511aafa501fbfcf86c18a0f2b04ec9ba859e2 Mon Sep 17 00:00:00 2001
+From 9bf10e66e9db9009871610710edb16a8ce420688 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 16:37:04 -0500
 Subject: [PATCH] Implement ItemFactory#getMonsterEgg
@@ -28,5 +28,5 @@ index 03ba22659..630c15d23 100644
 +    // Purpur end
  }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0009-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From fee2dae7b361e8f2581abf84d1ea9f7a6eab0adf Mon Sep 17 00:00:00 2001
+From 0d962b82c49e96e14993d5dda1422e617dd5d3c6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:15 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
@@ -100,5 +100,5 @@ index 000000000..c050b75e9
 +    }
 +}
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0010-Implement-ChunkTooLargeEvent.patch

@@ -1,4 +1,4 @@
-From 908db90639dd171e257f91d6e339608f1be3414d Mon Sep 17 00:00:00 2001
+From f8e61f206d1d08534ccdfea936d48944e776113a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 12 Jul 2019 02:09:58 -0500
 Subject: [PATCH] Implement ChunkTooLargeEvent
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement ChunkTooLargeEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java b/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java
 new file mode 100644
-index 00000000..f9d4a42c
+index 000000000..f9d4a42c6
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java
 @@ -0,0 +1,109 @@

patches/api/0011-Allow-inventory-resizing.patch

@@ -1,4 +1,4 @@
-From c39b728c52e814a1a45386141e4d3d4021ca5dd3 Mon Sep 17 00:00:00 2001
+From 7a311ecfaa92372c2c11233b1d68fe4b46f4262f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 06:50:55 -0500
 Subject: [PATCH] Allow inventory resizing
@@ -34,5 +34,5 @@ index 75e719ae8..fb7abc2a5 100644
          return size;
      }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0012-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 69c75b5e59e75f1e3399efcfc9e203548520b46d Mon Sep 17 00:00:00 2001
+From 197df8b1288d9ab4c40342dd26ac133a8c7f9d72 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:24 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -46,5 +46,5 @@ index 5337e3c5a..14da18751 100644
      // Purpur end
  }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0013-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 4effdeda4f4b6828eaf78212a560842e43d7b323 Mon Sep 17 00:00:00 2001
+From 3a6077c8aec71ab69a738f53ec7f2b7ce1282fee Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 10 Aug 2019 22:19:56 -0500
 Subject: [PATCH] Implement AFK API
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement AFK API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 new file mode 100644
-index 00000000..4db33485
+index 000000000..4db334854
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 @@ -0,0 +1,70 @@
@@ -86,7 +86,7 @@ index 00000000..4db33485
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8d8d8957..d430ce0b 100644
+index 8d8d89576..d430ce0ba 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2096,4 +2096,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -116,5 +116,5 @@ index 8d8d8957..d430ce0b 100644
 +    // Purpur end
  }
 -- 
-2.20.1
+2.23.0.rc1
 

patches/api/0014-Expose-internal-current-tick.patch

@@ -1,4 +1,4 @@
-From b4d42587db5f3fbd98fc5b6f6d713bfc0eff324a Mon Sep 17 00:00:00 2001
+From b1d18386b24c15dce55afc1aa9fa95727e2004bb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 1 Sep 2019 17:22:33 -0500
 Subject: [PATCH] Expose internal current tick
@@ -9,7 +9,7 @@ Subject: [PATCH] Expose internal current tick
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f87b8c3d..919ff23c 100644
+index f87b8c3d5..919ff23c7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1619,6 +1619,15 @@ public final class Bukkit {
@@ -29,7 +29,7 @@ index f87b8c3d..919ff23c 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 14da1875..4ff5895f 100644
+index 14da18751..4ff5895ff 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1414,5 +1414,12 @@ public interface Server extends PluginMessageRecipient {