From 081a882f947dc923cc68cca87a3a9c916aa37ec8 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Fri, 9 Jul 2021 16:08:42 +0200 Subject: [PATCH] Updated Upstream (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 CraftBukkit Changes: b5d7883a SPIGOT-6634: Override needed method 99561c21 SPIGOT-6624: Explosions do not destroy blocks out of vanilla heights in custom dimensions --- .../Allow-explosions-under-0-height.patch | 23 ------------------- patches/server/MC-Utils.patch | 2 +- ...-headless-pistons-from-being-created.patch | 2 +- work/CraftBukkit | 2 +- 4 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 patches/server/Allow-explosions-under-0-height.patch diff --git a/patches/server/Allow-explosions-under-0-height.patch b/patches/server/Allow-explosions-under-0-height.patch deleted file mode 100644 index 85eb78081c..0000000000 --- a/patches/server/Allow-explosions-under-0-height.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Thu, 24 Jun 2021 01:42:35 +0100 -Subject: [PATCH] Allow explosions under 0 height - -Upstream forgot to update the check here which prevents explosions -occuring under 0 height, however, vanilla already checks that we -are in bounds of the world above this, so this call is entirely -redundant. - -diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/level/Explosion.java -+++ b/src/main/java/net/minecraft/world/level/Explosion.java -@@ -0,0 +0,0 @@ public class Explosion { - f -= ((Float) optional.get() + 0.3F) * 0.3F; - } - -- if (f > 0.0F && this.damageCalculator.shouldBlockExplode(this, this.level, blockposition, iblockdata, f) && blockposition.getY() < 256 && blockposition.getY() >= 0) { // CraftBukkit - don't wrap explosions -+ if (f > 0.0F && this.damageCalculator.shouldBlockExplode(this, this.level, blockposition, iblockdata, f)/* && blockposition.getY() < 256 && blockposition.getY() >= 0*/) { // CraftBukkit - don't wrap explosions // Paper - permit < 0 - set.add(blockposition); - // Paper start - prevent headless pistons from forming - if (!com.destroystokyo.paper.PaperConfig.allowHeadlessPistons && iblockdata.getBlock() == Blocks.MOVING_PISTON) { diff --git a/patches/server/MC-Utils.patch b/patches/server/MC-Utils.patch index 67a1543f7b..2d95a8a38a 100644 --- a/patches/server/MC-Utils.patch +++ b/patches/server/MC-Utils.patch @@ -4257,7 +4257,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java @@ -0,0 +0,0 @@ public class DummyGeneratorAccess implements LevelAccessor { public FluidState getFluidState(BlockPos pos) { - throw new UnsupportedOperationException("Not supported yet."); + return Fluids.EMPTY.defaultFluidState(); // SPIGOT-6634 } + // Paper start - if loaded util + @javax.annotation.Nullable diff --git a/patches/server/Prevent-headless-pistons-from-being-created.patch b/patches/server/Prevent-headless-pistons-from-being-created.patch index 6c5399dedd..e4e8aa196a 100644 --- a/patches/server/Prevent-headless-pistons-from-being-created.patch +++ b/patches/server/Prevent-headless-pistons-from-being-created.patch @@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import net.minecraft.world.level.material.FluidState; @@ -0,0 +0,0 @@ public class Explosion { - if (f > 0.0F && this.damageCalculator.shouldBlockExplode(this, this.level, blockposition, iblockdata, f) && blockposition.getY() < 256 && blockposition.getY() >= 0) { // CraftBukkit - don't wrap explosions + if (f > 0.0F && this.damageCalculator.shouldBlockExplode(this, this.level, blockposition, iblockdata, f)) { set.add(blockposition); + // Paper start - prevent headless pistons from forming + if (!com.destroystokyo.paper.PaperConfig.allowHeadlessPistons && iblockdata.getBlock() == Blocks.MOVING_PISTON) { diff --git a/work/CraftBukkit b/work/CraftBukkit index fb556bfa14..b5d7883afc 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit fb556bfa1404661b38cc3abd1f0a7d02764f8f5b +Subproject commit b5d7883afc519c56031e6cd93462ba4601075aae