2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/level/block/BlockFluids.java
|
|
|
|
+++ b/net/minecraft/world/level/block/BlockFluids.java
|
2023-12-05 17:40:00 +01:00
|
|
|
@@ -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 @@
|
2022-02-28 16:00:00 +01:00
|
|
|
if (world.getFluidState(blockposition1).is(TagsFluid.WATER)) {
|
2021-11-21 23:00:00 +01:00
|
|
|
Block block = world.getFluidState(blockposition).isSource() ? Blocks.OBSIDIAN : Blocks.COBBLESTONE;
|
2018-07-15 02:00:00 +02:00
|
|
|
|
2021-11-21 23:00:00 +01:00
|
|
|
- world.setBlockAndUpdate(blockposition, block.defaultBlockState());
|
2021-06-11 07:00:00 +02:00
|
|
|
- this.fizz(world, blockposition);
|
|
|
|
+ // CraftBukkit start
|
2021-11-21 23:00:00 +01:00
|
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, blockposition, block.defaultBlockState())) {
|
2021-06-11 07:00:00 +02:00
|
|
|
+ this.fizz(world, blockposition);
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
return false;
|
|
|
|
}
|
2016-12-09 02:53:15 +01:00
|
|
|
|
2021-11-21 23:00:00 +01:00
|
|
|
if (flag && world.getBlockState(blockposition1).is(Blocks.BLUE_ICE)) {
|
|
|
|
- world.setBlockAndUpdate(blockposition, Blocks.BASALT.defaultBlockState());
|
2021-06-11 07:00:00 +02:00
|
|
|
- this.fizz(world, blockposition);
|
|
|
|
+ // CraftBukkit start
|
2021-11-21 23:00:00 +01:00
|
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, blockposition, Blocks.BASALT.defaultBlockState())) {
|
2021-06-11 07:00:00 +02:00
|
|
|
+ this.fizz(world, blockposition);
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
return false;
|
2016-12-09 02:53:15 +01:00
|
|
|
}
|
2021-06-11 07:00:00 +02:00
|
|
|
}
|