1 files changed, 36 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/world/level/block/BlockFluids.patch b/patch-remap/og/net/minecraft/world/level/block/BlockFluids.patch
new file mode 100644
index 0000000000..33ae74b51b
--- /dev/null
+++ b/patch-remap/og/net/minecraft/world/level/block/BlockFluids.patch
@@ -0,0 +1,36 @@
+--- a/net/minecraft/world/level/block/BlockFluids.java
++++ b/net/minecraft/world/level/block/BlockFluids.java
+@@ -39,7 +39,7 @@
+ public class BlockFluids extends Block implements IFluidSource {
+ 
+     private static final Codec<FluidTypeFlowing> FLOWING_FLUID = BuiltInRegistries.FLUID.byNameCodec().comapFlatMap((fluidtype) -> {
+-        DataResult dataresult;
++        DataResult<FluidTypeFlowing> dataresult; // CraftBukkit - decompile error
+ 
+         if (fluidtype instanceof FluidTypeFlowing) {
+             FluidTypeFlowing fluidtypeflowing = (FluidTypeFlowing) fluidtype;
+@@ -174,14 +174,20 @@
+                 if (world.getFluidState(blockposition1).is(TagsFluid.WATER)) {
+                     Block block = world.getFluidState(blockposition).isSource() ? Blocks.OBSIDIAN : Blocks.COBBLESTONE;
+ 
+-                    world.setBlockAndUpdate(blockposition, block.defaultBlockState());
+-                    this.fizz(world, blockposition);
++                    // CraftBukkit start
++                    if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, blockposition, block.defaultBlockState())) {
++                        this.fizz(world, blockposition);
++                    }
++                    // CraftBukkit end
+                     return false;
+                 }
+ 
+                 if (flag && world.getBlockState(blockposition1).is(Blocks.BLUE_ICE)) {
+-                    world.setBlockAndUpdate(blockposition, Blocks.BASALT.defaultBlockState());
+-                    this.fizz(world, blockposition);
++                    // CraftBukkit start
++                    if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, blockposition, Blocks.BASALT.defaultBlockState())) {
++                        this.fizz(world, blockposition);
++                    }
++                    // CraftBukkit end
+                     return false;
+                 }
+             }