Updated Upstream (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

CraftBukkit Changes:
c6997924 SPIGOT-5110: Zombies converting to drowned too quickly
0c575603 SPIGOT-5101: Raids crash

Spigot-Server-Patches/Add-more-Zombie-API.patch

@@ -18,7 +18,7 @@ index 5e88367d3c..c73d2ff5da 100644
          byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 76cf1d8bfc..6e265467b0 100644
+index 5d93af5857..552bad0520 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {

Spigot-Server-Patches/EntityTransformedEvent.patch

@@ -29,7 +29,7 @@ index 9311cc5bd6..07f7b90f58 100644
          // CraftBukkit end
          this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 0f4e50c3fe..76cf1d8bfc 100644
+index 19eb72909a..5d93af5857 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {

Spigot-Server-Patches/Fix-Raids-CME.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Wed, 26 Jun 2019 03:04:45 +0100
-Subject: [PATCH] Fix Raids CME
-
-
-diff --git a/src/main/java/net/minecraft/server/Raid.java b/src/main/java/net/minecraft/server/Raid.java
-index 6c1bbefd71..72f76d6c02 100644
---- a/src/main/java/net/minecraft/server/Raid.java
-+++ b/src/main/java/net/minecraft/server/Raid.java
-@@ -0,0 +0,0 @@ public class Raid {
-     private void y() {
-         Collection<EntityPlayer> collection = this.r.getPlayers();
-         Set<EntityPlayer> set = Sets.newHashSet(collection);
--        Iterator iterator = collection.iterator();
-+        Iterator iterator = set.iterator(); // Paper - use the set, this doesn't get modified out of scope
- 
-         while (iterator.hasNext()) {
-             EntityPlayer entityplayer = (EntityPlayer) iterator.next();
-             BlockPosition blockposition = new BlockPosition(entityplayer);
- 
-             if (this.k.c_(blockposition) != this) {
--                set.remove(entityplayer);
-+                iterator.remove(); // Paper
-                 this.r.removePlayer(entityplayer);
-             }
-         }
---

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit e8b39d430a77c2e53656b4c7bc2ed4b4a2b48a00
+Subproject commit c69979247bdae6884d4edf377d485cf88ddfa0f5