42 Zeilen
2.1 KiB
Diff
42 Zeilen
2.1 KiB
Diff
--- a/net/minecraft/server/BlockFluids.java
|
|
+++ b/net/minecraft/server/BlockFluids.java
|
|
@@ -57,10 +57,10 @@
|
|
public VoxelShape a(IBlockData iblockdata, IBlockAccess iblockaccess, BlockPosition blockposition) {
|
|
Fluid fluid = iblockaccess.getFluid(blockposition.up());
|
|
|
|
- return fluid.c().a((FluidType) this.b) ? VoxelShapes.b() : (VoxelShape) this.o.computeIfAbsent(iblockdata, (iblockdata) -> {
|
|
- Fluid fluid = iblockdata.s();
|
|
+ return fluid.c().a((FluidType) this.b) ? VoxelShapes.b() : (VoxelShape) this.o.computeIfAbsent(iblockdata, (iblockdata1) -> { // CraftBukkit - decompile errors
|
|
+ Fluid fluid1 = iblockdata1.s();
|
|
|
|
- return VoxelShapes.create(0.0D, 0.0D, 0.0D, 1.0D, (double) fluid.getHeight(), 1.0D);
|
|
+ return VoxelShapes.create(0.0D, 0.0D, 0.0D, 1.0D, (double) fluid1.getHeight(), 1.0D);
|
|
});
|
|
}
|
|
|
|
@@ -117,14 +117,20 @@
|
|
Fluid fluid = world.getFluid(blockposition);
|
|
|
|
if (fluid.d()) {
|
|
- world.setTypeUpdate(blockposition, Blocks.OBSIDIAN.getBlockData());
|
|
- this.fizz(world, blockposition);
|
|
+ // CraftBukkit start
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, blockposition, Blocks.OBSIDIAN.getBlockData())) {
|
|
+ this.fizz(world, blockposition);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
return false;
|
|
}
|
|
|
|
if (fluid.getHeight() >= 0.44444445F) {
|
|
- world.setTypeUpdate(blockposition, Blocks.COBBLESTONE.getBlockData());
|
|
- this.fizz(world, blockposition);
|
|
+ // CraftBukkit start
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, blockposition, Blocks.COBBLESTONE.getBlockData())) {
|
|
+ this.fizz(world, blockposition);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
return false;
|
|
}
|
|
}
|