From 11b10106ee9bba7116c269d85e3275dc42a3c077 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 11 Apr 2021 01:49:43 -0700 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) 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 --- Spigot-API-Patches/Add-More-Creeper-API.patch | 7 ------- Spigot-Server-Patches/Add-More-Creeper-API.patch | 13 ------------- ...-Ignited-flag-on-cancel-of-Explosion-Event.patch | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 5 files changed, 3 insertions(+), 23 deletions(-) diff --git a/Spigot-API-Patches/Add-More-Creeper-API.patch b/Spigot-API-Patches/Add-More-Creeper-API.patch index 0b5c9bcfa..908d862c0 100644 --- a/Spigot-API-Patches/Add-More-Creeper-API.patch +++ b/Spigot-API-Patches/Add-More-Creeper-API.patch @@ -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 } diff --git a/Spigot-Server-Patches/Add-More-Creeper-API.patch b/Spigot-Server-Patches/Add-More-Creeper-API.patch index 520dbe22e..cd6be1698 100644 --- a/Spigot-Server-Patches/Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/Add-More-Creeper-API.patch @@ -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 POWERED = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i); - private static final DataWatcherObject d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i); private static final DataWatcherObject 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 } diff --git a/Spigot-Server-Patches/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch index 972234973..58597e566 100644 --- a/Spigot-Server-Patches/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch +++ b/Spigot-Server-Patches/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch @@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - private static final DataWatcherObject d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i); + private static final DataWatcherObject d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i); private static final DataWatcherObject 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(); diff --git a/work/Bukkit b/work/Bukkit index bb27a6c72..b302317a9 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit bb27a6c72318bca9edeee6b62497acb3a1b2391e +Subproject commit b302317a9590f13ee937fa58941048c8b72fd9f8 diff --git a/work/CraftBukkit b/work/CraftBukkit index c85efa876..0e26ddb6a 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit c85efa8767daf863ba854dc451571c46ced9302f +Subproject commit 0e26ddb6a3f17222efa24654432b71f89b341c79