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
This commit is contained in:
Shane Freeder 2019-06-19 12:55:03 +01:00
parent da401a6d10
commit d9c4f8f67b
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
4 changed files with 15 additions and 24 deletions

View file

@ -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