diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 5f8a9e4252..eb1bf55e59 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -13,9 +13,11 @@ import org.bukkit.EntityEffect;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.World;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.PistonMoveReaction;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.block.CraftBlock;
 import org.bukkit.craftbukkit.util.CraftChatMessage;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -720,6 +722,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
         return PistonMoveReaction.getById(getHandle().getPushReaction().ordinal());
     }
 
+    @Override
+    public BlockFace getFacing() {
+        // Use this method over getDirection because it handles boats and minecarts.
+        return CraftBlock.notchToBlockFace(getHandle().getAdjustedDirection());
+    }
+
     protected NBTTagCompound save() {
         NBTTagCompound nbttagcompound = new NBTTagCompound();