mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
Fix leaky pipes (water flow). Fixes BUKKIT-3085
(Also, fix mistranslation for VehicleBlockCollisionEvent)
This commit is contained in:
parent
c596093c31
commit
11894784b0
2 changed files with 3 additions and 3 deletions
|
@ -134,7 +134,7 @@ public class BlockFlowing extends BlockFluids {
|
||||||
}
|
}
|
||||||
|
|
||||||
// CraftBukkit start - all four cardinal directions. Do not change the order!
|
// CraftBukkit start - all four cardinal directions. Do not change the order!
|
||||||
BlockFace[] faces = new BlockFace[] { BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH, BlockFace.NORTH };
|
BlockFace[] faces = new BlockFace[] { BlockFace.WEST, BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH };
|
||||||
int index = 0;
|
int index = 0;
|
||||||
|
|
||||||
for (BlockFace currentFace : faces) {
|
for (BlockFace currentFace : faces) {
|
||||||
|
|
|
@ -638,9 +638,9 @@ public abstract class Entity {
|
||||||
} else if (d6 < d0) {
|
} else if (d6 < d0) {
|
||||||
block = block.getRelative(BlockFace.WEST);
|
block = block.getRelative(BlockFace.WEST);
|
||||||
} else if (d8 > d2) {
|
} else if (d8 > d2) {
|
||||||
block = block.getRelative(BlockFace.NORTH);
|
|
||||||
} else if (d8 < d2) {
|
|
||||||
block = block.getRelative(BlockFace.SOUTH);
|
block = block.getRelative(BlockFace.SOUTH);
|
||||||
|
} else if (d8 < d2) {
|
||||||
|
block = block.getRelative(BlockFace.NORTH);
|
||||||
}
|
}
|
||||||
|
|
||||||
VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, block);
|
VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, block);
|
||||||
|
|
Loading…
Reference in a new issue