diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 8c767dbd09..37dc9f8f74 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 2faffdf5f2..bcbbc72f61 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);
     }
 
     /**