OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated Upstream (Bukkit/CraftBukkit)

Browse source 
Upstream has released updates that appear 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:
b302317a SPIGOT-5877: Add scaffolding for custom dimensions and biomes
ccccb625 SPIGOT-6417: Add Creeper fuse ticks API

CraftBukkit Changes:
0e26ddb6 SPIGOT-5877: Add scaffolding for custom dimensions and biomes
170d6feb SPIGOT-6417: Add Creeper fuse ticks API
This commit is contained in:
Jake Potrebic 2021-04-11 01:49:43 -07:00
parent aed4e70db8
commit 11b10106ee
5 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Spigot-API-Patches/Add-More-Creeper-API.patch
View file

@ -87,12 +87,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * @return Ignited state
+ */
+ public boolean isIgnited();
+
+ /**
+ * Get the number of ticks this creeper has been ignited (armed to explode)
+ *
+ * @return Ticks creeper has been ignited
+ */
+ public int getFuseTicks();
+ // Paper end
}

13
Spigot-Server-Patches/Add-More-Creeper-API.patch
View file

@ -8,15 +8,6 @@ diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
@@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster {
private static final DataWatcherObject<Boolean> POWERED = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i);
private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i); private static final DataWatcherObject<Boolean> isIgnitedDW = d; // Paper OBFHELPER
private int bo;
- private int fuseTicks;
+ public int fuseTicks; // Paper - public
public int maxFuseTicks = 30;
public int explosionRadius = 3;
private int bs;
@@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster {
}
@ -54,9 +45,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public boolean isIgnited() {
+ return getHandle().isIgnited();
+ }
+
+ public int getFuseTicks() {
+ return getHandle().fuseTicks;
+ }
+ // Paper end
}

2
Spigot-Server-Patches/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
View file

@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i);
+ private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i); private static final DataWatcherObject<Boolean> isIgnitedDW = d; // Paper OBFHELPER
private int bo;
private int fuseTicks;
public int fuseTicks; // PAIL
public int maxFuseTicks = 30;
@@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster {
this.createEffectCloud();

2
work/Bukkit

@ -1 +1 @@
Subproject commit bb27a6c72318bca9edeee6b62497acb3a1b2391e
Subproject commit b302317a9590f13ee937fa58941048c8b72fd9f8

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit c85efa8767daf863ba854dc451571c46ced9302f
Subproject commit 0e26ddb6a3f17222efa24654432b71f89b341c79