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 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 --- a/src/main/java/org/bukkit/entity/Creeper.java
+++ b/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 { @@ -0,0 +0,0 @@ public interface Creeper extends Monster {
* @return the explosion radius * griefing gamerule.
*/ */
public int getExplosionRadius(); public void ignite();
+
+ // Paper start + // Paper start
+
+ /** + /**
+ * Set whether creeper is ignited or not (armed to explode) + * Set whether creeper is ignited or not (armed to explode)
+ * + *
@@ -94,11 +94,6 @@ index 32f18a3ae..601ba4afe 100644
+ * @return Ticks creeper has been ignited + * @return Ticks creeper has been ignited
+ */ + */
+ public int getFuseTicks(); + public int getFuseTicks();
+
+ /**
+ * Make the creeper explode (no waiting for fuse)
+ */
+ public void explode();
+ // Paper end + // Paper end
} }
-- --

View File

@@ -5,7 +5,7 @@ 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 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 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster { @@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster {
@@ -22,7 +22,7 @@ index 29569805cb..0c2c3c7308 100644
} }
+ public void explode() { this.eb(); } // Paper - OBFHELPER + public void explode() { this.eb(); } // Paper - OBFHELPER
private void eb() { public void eb() { // PAIL rename explode, private -> public
if (!this.world.isClientSide) { if (!this.world.isClientSide) {
Explosion.Effect explosion_effect = this.world.getGameRules().getBoolean("mobGriefing") ? Explosion.Effect.DESTROY : Explosion.Effect.NONE; Explosion.Effect explosion_effect = this.world.getGameRules().getBoolean("mobGriefing") ? Explosion.Effect.DESTROY : Explosion.Effect.NONE;
@@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster { @@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster {
@@ -47,7 +47,7 @@ index 29569805cb..0c2c3c7308 100644
public boolean canCauseHeadDrop() { 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 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
@@ -0,0 +0,0 @@ public class CraftCreeper extends CraftMonster implements Creeper { @@ -0,0 +0,0 @@ public class CraftCreeper extends CraftMonster implements Creeper {
@@ -67,10 +67,6 @@ index 796ee9e40d..2d38823c57 100644
+ public int getFuseTicks() { + public int getFuseTicks() {
+ return getHandle().fuseTicks; + return getHandle().fuseTicks;
+ } + }
+
+ public void explode() {
+ getHandle().explode();
+ }
+ // Paper end + // Paper end
} }
-- --