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 c505668f4e
commit 4606139d59
4 changed files with 9 additions and 18 deletions

View File

@@ -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
@@ -0,0 +0,0 @@ public interface Creeper extends Monster {
* @return the explosion radius
* griefing gamerule.
*/
public int getExplosionRadius();
+
public void ignite();
+ // Paper start
+
+ /**
+ * Set whether creeper is ignited or not (armed to explode)
+ *
@@ -94,11 +94,6 @@ 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
}
--