mirror of
https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git
synced 2025-02-16 19:15:59 +00:00
37 lines
1.9 KiB
Diff
37 lines
1.9 KiB
Diff
--- a/net/minecraft/world/level/block/BlockFluids.java
|
|
+++ b/net/minecraft/world/level/block/BlockFluids.java
|
|
@@ -42,7 +42,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) {
|
|
dataresult = DataResult.success(fluidtypeflowing);
|
|
@@ -175,14 +175,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;
|
|
}
|
|
}
|