SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-server/nms-patches/FluidTypeFlowing.patch
View File

@@ -15,10 +15,10 @@
public abstract class FluidTypeFlowing extends FluidType {
@@ -141,6 +149,15 @@
@@ -134,6 +142,15 @@
Fluid fluid1 = this.a((IWorldReader) generatoraccess, blockposition1, iblockdata1);
if (this.a(generatoraccess, blockposition, iblockdata, EnumDirection.DOWN, blockposition1, iblockdata1, generatoraccess.getFluid(blockposition1), fluid1.c())) {
if (this.a(generatoraccess, blockposition, iblockdata, EnumDirection.DOWN, blockposition1, iblockdata1, generatoraccess.getFluid(blockposition1), fluid1.getType())) {
+ // CraftBukkit start
+ org.bukkit.block.Block source = CraftBlock.at(generatoraccess, blockposition);
+ BlockFromToEvent event = new BlockFromToEvent(source, BlockFace.DOWN);
@@ -31,10 +31,10 @@
this.a(generatoraccess, blockposition1, iblockdata1, EnumDirection.DOWN, fluid1);
if (this.a((IWorldReader) generatoraccess, blockposition) >= 3) {
this.a(generatoraccess, blockposition, fluid, iblockdata);
@@ -171,6 +188,15 @@
@@ -164,6 +181,15 @@
IBlockData iblockdata1 = generatoraccess.getType(blockposition1);
if (this.a(generatoraccess, blockposition, iblockdata, enumdirection, blockposition1, iblockdata1, generatoraccess.getFluid(blockposition1), fluid1.c())) {
if (this.a(generatoraccess, blockposition, iblockdata, enumdirection, blockposition1, iblockdata1, generatoraccess.getFluid(blockposition1), fluid1.getType())) {
+ // CraftBukkit start
+ org.bukkit.block.Block source = CraftBlock.at(generatoraccess, blockposition);
+ BlockFromToEvent event = new BlockFromToEvent(source, org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(enumdirection));
@@ -47,9 +47,9 @@
this.a(generatoraccess, blockposition1, iblockdata1, enumdirection, fluid1);
}
}
@@ -448,12 +474,23 @@
@@ -442,12 +468,23 @@
if (fluid1.e()) {
if (fluid1.isEmpty()) {
fluid = fluid1;
- world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 3);
+ // CraftBukkit start
@@ -61,7 +61,7 @@
+ // CraftBukkit end
} else if (!fluid1.equals(fluid)) {
fluid = fluid1;
IBlockData iblockdata = fluid1.i();
IBlockData iblockdata = fluid1.getBlockData();
-
- world.setTypeAndData(blockposition, iblockdata, 2);
+ // CraftBukkit start
@@ -71,6 +71,6 @@
+ }
+ world.setTypeAndData(blockposition, ((CraftBlockData) event.getNewData()).getState(), 2);
+ // CraftBukkit end
world.getFluidTickList().a(blockposition, fluid1.c(), i);
world.getFluidTickList().a(blockposition, fluid1.getType(), i);
world.applyPhysics(blockposition, iblockdata.getBlock());
}