From 6b8f6d3d79927d2c80507ee67728aeddabb36e36 Mon Sep 17 00:00:00 2001
From: Samsuik <kfian294ma4@gmail.com>
Date: Sun, 22 Dec 2024 15:35:19 +0000
Subject: [PATCH] Fix durable blocks being destructable at the bottom of the
 world

This would causes issues if bedrock is configured to be a durable block.
---
 .../features/0013-Explosion-Durable-Blocks.patch          | 8 ++++----
 .../features/0014-Destroy-Waterlogged-Blocks.patch        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sakura-server/minecraft-patches/features/0013-Explosion-Durable-Blocks.patch b/sakura-server/minecraft-patches/features/0013-Explosion-Durable-Blocks.patch
index f944bdb..0945ff0 100644
--- a/sakura-server/minecraft-patches/features/0013-Explosion-Durable-Blocks.patch
+++ b/sakura-server/minecraft-patches/features/0013-Explosion-Durable-Blocks.patch
@@ -53,7 +53,7 @@ index b4a8a81f1fa091e45f1f39fdb69c61871d7dc6b9..19aa5010b019e343d0fb085359eac98b
      protected Level(
          WritableLevelData levelData,
 diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
-index 0285e19d6265056fb5ff9855a5dd41bd16bbc082..b66a9f646dc853f8b2f86137a668fe692e523e92 100644
+index 0285e19d6265056fb5ff9855a5dd41bd16bbc082..2d0a2f6dc9c02a86b443ccdab2eeba283eb2d229 100644
 --- a/net/minecraft/world/level/ServerExplosion.java
 +++ b/net/minecraft/world/level/ServerExplosion.java
 @@ -133,7 +133,7 @@ public class ServerExplosion implements Explosion {
@@ -72,10 +72,10 @@ index 0285e19d6265056fb5ff9855a5dd41bd16bbc082..b66a9f646dc853f8b2f86137a668fe69
 +    // Sakura start - explosion durable blocks
 +    private Optional<Float> calculateBlockResistance(BlockState blockState, FluidState fluidState, BlockPos pos) {
 +        if (!blockState.isAir()) {
-+            Block block = blockState.getBlock();
-+            me.samsuik.sakura.explosion.durable.DurableMaterial material = this.level.localConfig().config(pos).durableMaterials.get(block);
++            final Block block = blockState.getBlock();
++            final me.samsuik.sakura.explosion.durable.DurableMaterial material = this.level.localConfig().config(pos).durableMaterials.get(block);
 +
-+            if (material != null && material.resistance() >= 0.0f && (this.level.sakuraConfig().cannons.explosion.allowNonTntBreakingDurableBlocks || this.source instanceof net.minecraft.world.entity.item.PrimedTnt)) {
++            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());
 +            }
 +        }
diff --git a/sakura-server/minecraft-patches/features/0014-Destroy-Waterlogged-Blocks.patch b/sakura-server/minecraft-patches/features/0014-Destroy-Waterlogged-Blocks.patch
index 3e62e8e..c287a4d 100644
--- a/sakura-server/minecraft-patches/features/0014-Destroy-Waterlogged-Blocks.patch
+++ b/sakura-server/minecraft-patches/features/0014-Destroy-Waterlogged-Blocks.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Destroy Waterlogged Blocks
 
 
 diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
-index 58c14cc2d041348f42e8466fc93f18736c2618da..f74aee504fa048a43272a3c3e9d1c6f9fa4a5913 100644
+index 2d0a2f6dc9c02a86b443ccdab2eeba283eb2d229..7b5a50ef269d0ca59fb067258421b53971a9998d 100644
 --- a/net/minecraft/world/level/ServerExplosion.java
 +++ b/net/minecraft/world/level/ServerExplosion.java
 @@ -402,6 +402,11 @@ public class ServerExplosion implements Explosion {
-             if (material != null && material.resistance() >= 0.0f && (this.level.sakuraConfig().cannons.explosion.allowNonTntBreakingDurableBlocks || this.source instanceof net.minecraft.world.entity.item.PrimedTnt)) {
+             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());
              }
 +            // Sakura start - destroy water logged blocks