diff --git a/sakura-server/minecraft-patches/features/0029-Protect-blocks-outside-the-world-border.patch b/sakura-server/minecraft-patches/features/0029-Protect-blocks-outside-the-world-border.patch deleted file mode 100644 index a650e23..0000000 --- a/sakura-server/minecraft-patches/features/0029-Protect-blocks-outside-the-world-border.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Samsuik -Date: Fri, 7 Mar 2025 14:21:13 +0000 -Subject: [PATCH] Protect blocks outside the world border - - -diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java -index 451cb54da29ad7e6fc74f4a57df8493ce3e43b2d..43cf8815a04ffd5d5811be7675718084826824d5 100644 ---- a/net/minecraft/world/level/ServerExplosion.java -+++ b/net/minecraft/world/level/ServerExplosion.java -@@ -417,6 +417,11 @@ public class ServerExplosion implements Explosion { - return Optional.of(Blocks.BARRIER.getExplosionResistance()); - } - // Sakura end - protect scaffolding from creepers -+ // Sakura start - protect blocks outside the world border -+ if (this.level.sakuraConfig().cannons.explosion.protectBlocksOutsideTheWorldBorder && !this.level.getWorldBorder().isWithinBounds(pos)) { -+ return Optional.of(Blocks.BARRIER.getExplosionResistance()); -+ } -+ // Sakura end - protect blocks outside the world border - } - - return this.damageCalculator.getBlockExplosionResistance(this, this.level, pos, blockState, fluidState); diff --git a/sakura-server/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java b/sakura-server/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java index b3c81e1..671acdd 100644 --- a/sakura-server/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java +++ b/sakura-server/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java @@ -98,8 +98,6 @@ public final class WorldConfiguration extends ConfigurationPart { public boolean explosionsHurtPlayers = true; public boolean explosionsDropItems = true; public boolean useBlockCacheAcrossExplosions = false; - @Comment("Protect blocks being destroyed outside the world border") - public boolean protectBlocksOutsideTheWorldBorder = false; } public Mechanics mechanics = new Mechanics();