Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BREAKING] Update BlockFace directions. Fixes BUKKIT-1567, BUKKIT-3069

Browse Source 
The answer is 42
This commit is contained in:
feildmaster
2012-12-01 00:22:01 -06:00
parent 3404318bc5
commit c596093c31
6 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/BlockFlowing.java
View File

@@ -134,7 +134,7 @@ public class BlockFlowing extends BlockFluids {
}
// CraftBukkit start - all four cardinal directions. Do not change the order!
BlockFace[] faces = new BlockFace[] { BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST };
BlockFace[] faces = new BlockFace[] { BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH, BlockFace.NORTH };
int index = 0;
for (BlockFace currentFace : faces) {

12
src/main/java/net/minecraft/server/Entity.java
View File

@@ -634,13 +634,13 @@ public abstract class Entity {
org.bukkit.block.Block block = this.world.getWorld().getBlockAt(MathHelper.floor(this.locX), MathHelper.floor(this.locY - (double) this.height), MathHelper.floor(this.locZ));
if (d6 > d0) {
block = block.getRelative(BlockFace.SOUTH);
} else if (d6 < d0) {
block = block.getRelative(BlockFace.NORTH);
} else if (d8 > d2) {
block = block.getRelative(BlockFace.WEST);
} else if (d8 < d2) {
block = block.getRelative(BlockFace.EAST);
} else if (d6 < d0) {
block = block.getRelative(BlockFace.WEST);
} else if (d8 > d2) {
block = block.getRelative(BlockFace.NORTH);
} else if (d8 < d2) {
block = block.getRelative(BlockFace.SOUTH);
}
VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, block);