From b13450b368a1e7ff5185ae1c0a607d1856af79a7 Mon Sep 17 00:00:00 2001
From: Samsuik <40902469+Samsuik@users.noreply.github.com>
Date: Sat, 25 Nov 2023 20:37:44 +0000
Subject: [PATCH] Add option for concrete solidifying in water

---
 .../0004-Sakura-Configuration-Files.patch     |  5 +++--
 ...figure-concrete-solidifying-in-water.patch | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 patches/server/0042-Configure-concrete-solidifying-in-water.patch

diff --git a/patches/server/0004-Sakura-Configuration-Files.patch b/patches/server/0004-Sakura-Configuration-Files.patch
index 28b866d..11e826d 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..0b3dd8ffa00bfcfb1be09240d9db8b506329cd13
+index 0000000000000000000000000000000000000000..e7faa6f4677d2538885440fbcc90e813e6663eae
 --- /dev/null
 +++ b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
-@@ -0,0 +1,148 @@
+@@ -0,0 +1,149 @@
 +package me.samsuik.sakura.configuration;
 +
 +import com.mojang.logging.LogUtils;
@@ -669,6 +669,7 @@ index 0000000000000000000000000000000000000000..0b3dd8ffa00bfcfb1be09240d9db8b50
 +        public class Sand extends ConfigurationPart {
 +            public boolean loadsChunks;
 +            public boolean despawnInsideMovingPistons = true;
++            public boolean concreteSolidifyInWater = true;
 +
 +            @NestedSetting({"prevent-stacking", "against-border"})
 +            public boolean preventAgainstBorder = false;
diff --git a/patches/server/0042-Configure-concrete-solidifying-in-water.patch b/patches/server/0042-Configure-concrete-solidifying-in-water.patch
new file mode 100644
index 0000000..4c36f10
--- /dev/null
+++ b/patches/server/0042-Configure-concrete-solidifying-in-water.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samsuik <40902469+Samsuik@users.noreply.github.com>
+Date: Sat, 25 Nov 2023 20:36:05 +0000
+Subject: [PATCH] Configure concrete solidifying in water
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+index 87ef8f4953c7d9fddfc9ddbdb027e76145b645c8..7f01adefebb98edaa035711bcb18b695d167fe97 100644
+--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
++++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+@@ -293,7 +293,7 @@ public class FallingBlockEntity extends Entity {
+                 }
+                 // Sakura end
+ 
+-                boolean flag = this.blockState.getBlock() instanceof ConcretePowderBlock;
++                boolean flag = this.level().sakuraConfig().cannons.sand.concreteSolidifyInWater && this.blockState.getBlock() instanceof ConcretePowderBlock; // Sakura
+                 boolean flag1 = flag && this.level().getFluidState(blockposition).is(FluidTags.WATER);
+                 double d0 = this.getDeltaMovement().lengthSqr();
+