Paper/nms-patches/BlockFluids.patch

42 lines
2.1 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/BlockFluids.java
+++ b/net/minecraft/server/BlockFluids.java
2018-08-26 04:00:00 +02:00
@@ -57,10 +57,10 @@
2018-07-15 02:00:00 +02:00
public VoxelShape a(IBlockData iblockdata, IBlockAccess iblockaccess, BlockPosition blockposition) {
2018-12-06 00:00:00 +01:00
Fluid fluid = iblockaccess.getFluid(blockposition.up());
2018-08-26 04:00:00 +02:00
- return fluid.c().a((FluidType) this.b) ? VoxelShapes.b() : (VoxelShape) this.o.computeIfAbsent(iblockdata, (iblockdata) -> {
2018-07-15 02:00:00 +02:00
- Fluid fluid = iblockdata.s();
2018-08-26 04:00:00 +02:00
+ return fluid.c().a((FluidType) this.b) ? VoxelShapes.b() : (VoxelShape) this.o.computeIfAbsent(iblockdata, (iblockdata1) -> { // CraftBukkit - decompile errors
2018-07-15 02:00:00 +02:00
+ Fluid fluid1 = iblockdata1.s();
2018-12-06 00:00:00 +01:00
- 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);
2018-07-15 02:00:00 +02:00
});
}
2018-08-26 04:00:00 +02:00
@@ -117,14 +117,20 @@
2018-12-06 00:00:00 +01:00
Fluid fluid = world.getFluid(blockposition);
2018-07-15 02:00:00 +02:00
if (fluid.d()) {
- world.setTypeUpdate(blockposition, Blocks.OBSIDIAN.getBlockData());
- this.fizz(world, blockposition);
+ // CraftBukkit start
2018-07-15 02:00:00 +02:00
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, blockposition, Blocks.OBSIDIAN.getBlockData())) {
+ this.fizz(world, blockposition);
+ }
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
return false;
}
2018-12-06 00:00:00 +01:00
if (fluid.getHeight() >= 0.44444445F) {
- world.setTypeUpdate(blockposition, Blocks.COBBLESTONE.getBlockData());
- this.fizz(world, blockposition);
+ // CraftBukkit start
2018-07-15 02:00:00 +02:00
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, blockposition, Blocks.COBBLESTONE.getBlockData())) {
+ this.fizz(world, blockposition);
+ }
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
return false;
}
}