From b09fe801a13d370649731fed1126acab6484269e Mon Sep 17 00:00:00 2001
From: Samsuik <40902469+Samsuik@users.noreply.github.com>
Date: Mon, 20 Nov 2023 19:33:15 +0000
Subject: [PATCH] Add consistent explosion radius

---
 .../0004-Sakura-Configuration-Files.patch     |  5 +++--
 .../0036-Consistent-Explosion-Radius.patch    | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 patches/server/0036-Consistent-Explosion-Radius.patch

diff --git a/patches/server/0004-Sakura-Configuration-Files.patch b/patches/server/0004-Sakura-Configuration-Files.patch
index 7a35d8d..bea65a3 100644
--- a/patches/server/0004-Sakura-Configuration-Files.patch
+++ b/patches/server/0004-Sakura-Configuration-Files.patch
@@ -608,10 +608,10 @@ index 0000000000000000000000000000000000000000..5fc23a0b579d7cbe03baf5324bef887a
 +}
 diff --git a/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..4cb5a385e660be058ba471c779a2e2e7b7bb6605
+index 0000000000000000000000000000000000000000..4e62a5fbd2e1e674abfe4afb763118b7b0127b67
 --- /dev/null
 +++ b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
-@@ -0,0 +1,138 @@
+@@ -0,0 +1,139 @@
 +package me.samsuik.sakura.configuration;
 +
 +import com.mojang.logging.LogUtils;
@@ -691,6 +691,7 @@ index 0000000000000000000000000000000000000000..4cb5a385e660be058ba471c779a2e2e7
 +                map.put(Blocks.DAMAGED_ANVIL, new DurableMaterial(3, Blocks.END_STONE.getExplosionResistance()));
 +            });
 +            public boolean destroyWaterloggedBlocks = false;
++            public boolean consistentRadius = false;
 +        }
 +
 +        public Mechanics mechanics = new Mechanics();
diff --git a/patches/server/0036-Consistent-Explosion-Radius.patch b/patches/server/0036-Consistent-Explosion-Radius.patch
new file mode 100644
index 0000000..385ec42
--- /dev/null
+++ b/patches/server/0036-Consistent-Explosion-Radius.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samsuik <40902469+Samsuik@users.noreply.github.com>
+Date: Mon, 20 Nov 2023 19:32:31 +0000
+Subject: [PATCH] Consistent Explosion Radius
+
+
+diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
+index a6bbc29a77ff2d6d1e6eaa513e4b4bf71af77745..510746c24b3f7060525fe423ea7072f143c31a93 100644
+--- a/src/main/java/net/minecraft/world/level/Explosion.java
++++ b/src/main/java/net/minecraft/world/level/Explosion.java
+@@ -556,7 +556,7 @@ public class Explosion {
+                         double d2 = CACHED_RAYS[ray + 2];
+                         ray += 3;
+                         // Paper end - optimise explosions
+-                        float f = this.radius * (0.7F + this.level.random.nextFloat() * 0.6F);
++                        float f = this.radius * (0.7F + (this.level.sakuraConfig().cannons.explosion.consistentRadius ? 0.7F : this.level.random.nextFloat()) * 0.6F); // Sakura
+                         double d4 = this.x;
+                         double d5 = this.y;
+                         double d6 = this.z;