diff options
| author | Erik Broes <erikbroes@grum.nl> | 2011-07-17 15:02:32 +0200 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2011-07-17 18:14:45 +0200 |
| commit | f7712eb20c4bc8705b70a4dc8c29155fb49ef667 (patch) | |
| tree | 7c57001123e32f04adf40880eef2328081f77d69 /src/main | |
| parent | f3a86eaacaab527ce6dd26b3a9fd2ce86a15374c (diff) | |
| download | craftbukkit-f7712eb20c4bc8705b70a4dc8c29155fb49ef667.tar craftbukkit-f7712eb20c4bc8705b70a4dc8c29155fb49ef667.tar.gz craftbukkit-f7712eb20c4bc8705b70a4dc8c29155fb49ef667.tar.lz craftbukkit-f7712eb20c4bc8705b70a4dc8c29155fb49ef667.tar.xz craftbukkit-f7712eb20c4bc8705b70a4dc8c29155fb49ef667.zip | |
Deprecated Block.getFace(Face) and Block.getFace(Face,int); use getRelative()
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/minecraft/server/Entity.java | 8 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 8c767dbd..37dc9f8f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -535,13 +535,13 @@ public abstract class Entity { org.bukkit.block.Block block = this.world.getWorld().getBlockAt(MathHelper.floor(this.locX), MathHelper.floor(this.locY - 0.20000000298023224D - (double) this.height), MathHelper.floor(this.locZ)); if (d5 > d0) { - block = block.getFace(BlockFace.SOUTH); + block = block.getRelative(BlockFace.SOUTH); } else if (d5 < d0) { - block = block.getFace(BlockFace.NORTH); + block = block.getRelative(BlockFace.NORTH); } else if (d7 > d2) { - block = block.getFace(BlockFace.WEST); + block = block.getRelative(BlockFace.WEST); } else if (d7 < d2) { - block = block.getFace(BlockFace.EAST); + block = block.getRelative(BlockFace.EAST); } VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, block); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index 2faffdf5..bcbbc72f 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -182,7 +182,7 @@ public class CraftBlock implements Block { * @return Block at the given face */ public Block getFace(final BlockFace face) { - return getFace(face, 1); + return getRelative(face, 1); } /** @@ -201,7 +201,7 @@ public class CraftBlock implements Block { * @return Block at the given face */ public Block getFace(final BlockFace face, final int distance) { - return getRelative(face.getModX() * distance, face.getModY() * distance, face.getModZ() * distance); + return getRelative(face, distance); } /** |