Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-19 14:59:30 +00:00
Code Issues Releases Activity

Fix protect-blocks-above-y not protecting durable blocks

Browse Source
This commit is contained in:
Samsuik
2025-11-09 17:46:37 +00:00
parent 843a51aed2
commit a44cf095de
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sakura-server/minecraft-patches/features/0030-Protect-blocks-above-a-configured-Y-level-from-explo.patch
View File

@@ -5,18 +5,18 @@ Subject: [PATCH] Protect blocks above a configured Y-level from explosions
diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
index 71401708e65c9b06f30d124757fecf5f61eff957..d6ef61484019095399bb2ba3fcbd7aac30cff435 100644 index 71401708e65c9b06f30d124757fecf5f61eff957..1eb0ab17d999fcc62ff3d73ecbec9750284c0024 100644
--- a/net/minecraft/world/level/ServerExplosion.java --- a/net/minecraft/world/level/ServerExplosion.java
+++ b/net/minecraft/world/level/ServerExplosion.java +++ b/net/minecraft/world/level/ServerExplosion.java
@@ -417,6 +417,11 @@ public class ServerExplosion implements Explosion { @@ -399,6 +399,11 @@ public class ServerExplosion implements Explosion {
return Optional.of(Blocks.BARRIER.getExplosionResistance()); final Block block = blockState.getBlock();
} final me.samsuik.sakura.explosion.durable.DurableMaterial material = this.level.localConfig().config(pos).durableMaterials.get(block);
// Sakura end - protect scaffolding from creepers
+ // Sakura start - protect blocks above a configured Y-level from explosions + // Sakura start - protect blocks above a configured Y-level from explosions
+ if (this.level.sakuraConfig().cannons.explosion.protectBlocksAboveY.test(val -> pos.getY() >= val)) { + if (this.level.sakuraConfig().cannons.explosion.protectBlocksAboveY.test(val -> pos.getY() >= val)) {
+ return Optional.of(net.minecraft.world.level.block.Blocks.BARRIER.getExplosionResistance()); + return Optional.of(net.minecraft.world.level.block.Blocks.BARRIER.getExplosionResistance());
+ } + }
+ // Sakura end - protect blocks above a configured Y-level from explosions + // Sakura end - protect blocks above a configured Y-level from explosions
} if (material != null && material.resistance() >= 0.0f && pos.getY() > this.level.getMinY() && (this.level.sakuraConfig().cannons.explosion.allowNonTntBreakingDurableBlocks || this.source instanceof net.minecraft.world.entity.item.PrimedTnt)) {
return Optional.of(material.resistance());
return this.damageCalculator.getBlockExplosionResistance(this, this.level, pos, blockState, fluidState); }