From d9c4f8f67bbca2293d1daf7660dfa16e6d037be6 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 19 Jun 2019 12:55:03 +0100
Subject: [PATCH] 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:
fd317e44 Fix javadoc mistakes in previous commit
70e4c23d SPIGOT-5061: Add explode and ignite methods to Creeper

CraftBukkit Changes:
efd8a2b5 SPIGOT-5089: UnsupportedOperationException on setting villager memory to null
8003ced5 SPIGOT-5061: Add explode and ignite methods to Creeper
---
 .../0140-Add-More-Creeper-API.patch           | 19 +++++++------------
 .../0298-Add-More-Creeper-API.patch           | 16 ++++++----------
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 4 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch
index c7edc2e3d..7167a9ece 100644
--- a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch
+++ b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From 3c3a5b9e492d5f4e88739b12816ec2a9fcf5b377 Mon Sep 17 00:00:00 2001
+From 5c03633065ac302e4f78d956c5f60db96d36fa2e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:16 -0500
 Subject: [PATCH] Add More Creeper API
@@ -65,15 +65,15 @@ index 000000000..ff10251b6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java
-index 32f18a3ae..601ba4afe 100644
+index 1b8ece6df..faaeb44a9 100644
 --- a/src/main/java/org/bukkit/entity/Creeper.java
 +++ b/src/main/java/org/bukkit/entity/Creeper.java
-@@ -50,4 +50,32 @@ public interface Creeper extends Monster {
-      * @return the explosion radius
+@@ -71,4 +71,27 @@ public interface Creeper extends Monster {
+      * griefing gamerule.
       */
-     public int getExplosionRadius();
-+
+     public void ignite();
 +    // Paper start
++
 +    /**
 +     * Set whether creeper is ignited or not (armed to explode)
 +     *
@@ -94,13 +94,8 @@ index 32f18a3ae..601ba4afe 100644
 +     * @return Ticks creeper has been ignited
 +     */
 +    public int getFuseTicks();
-+
-+    /**
-+     * Make the creeper explode (no waiting for fuse)
-+     */
-+    public void explode();
 +    // Paper end
  }
 -- 
-2.21.0
+2.22.0
 
diff --git a/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch
index e5b1c7737..ffa1b0e81 100644
--- a/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch
@@ -1,11 +1,11 @@
-From 47fcf0b3a918f338131fb61a0b16771e22e3771c Mon Sep 17 00:00:00 2001
+From 3ab6ffe1a1dafdc0ec4bd187ceae8a5b85a3a7f9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:26 -0500
 Subject: [PATCH] Add More Creeper API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 29569805cb..0c2c3c7308 100644
+index 7181c663ae..165b07e142 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -13,7 +13,7 @@ public class EntityCreeper extends EntityMonster {
@@ -22,7 +22,7 @@ index 29569805cb..0c2c3c7308 100644
      }
  
 +    public void explode() { this.eb(); } // Paper - OBFHELPER
-     private void eb() {
+     public void eb() { // PAIL rename explode, private -> public
          if (!this.world.isClientSide) {
              Explosion.Effect explosion_effect = this.world.getGameRules().getBoolean("mobGriefing") ? Explosion.Effect.DESTROY : Explosion.Effect.NONE;
 @@ -252,8 +253,19 @@ public class EntityCreeper extends EntityMonster {
@@ -47,10 +47,10 @@ index 29569805cb..0c2c3c7308 100644
  
      public boolean canCauseHeadDrop() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-index 796ee9e40d..2d38823c57 100644
+index 95b3a7acc9..b6fb2b3458 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-@@ -78,4 +78,22 @@ public class CraftCreeper extends CraftMonster implements Creeper {
+@@ -88,4 +88,18 @@ public class CraftCreeper extends CraftMonster implements Creeper {
      public EntityType getType() {
          return EntityType.CREEPER;
      }
@@ -67,12 +67,8 @@ index 796ee9e40d..2d38823c57 100644
 +    public int getFuseTicks() {
 +        return getHandle().fuseTicks;
 +    }
-+
-+    public void explode() {
-+        getHandle().explode();
-+    }
 +    // Paper end
  }
 -- 
-2.21.0
+2.22.0
 
diff --git a/work/Bukkit b/work/Bukkit
index 04405534f..fd317e44b 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 04405534f2a29122608507b713f9de1f38ebc46a
+Subproject commit fd317e44bce1e29244e9244331091734d0e233bc
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f2757f95b..efd8a2b50 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f2757f95b3089d9beb17b5effe72ea183a18b224
+Subproject commit efd8a2b50ae4f82d27f4bcf4fcb5bf18ec02d322