2 files changed, 10 insertions, 12 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java
index 44082603..583f7dbd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java
@@ -48,15 +48,6 @@ public class CraftMinecart extends CraftVehicle implements Minecart {
         minecart.u = vel.getZ();
     }
 
-    public LivingEntity getPassenger() {
-        // @TODO: Implement
-        return null;
-    }
-
-    public boolean isEmpty() {
-        return minecart.j == null;
-    }
-
     public void setDamage(int damage) {
         minecart.a = damage;
     }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java b/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java
index a5c03868..c978b8b7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java
@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit;
 
-import net.minecraft.server.Entity;
-
+import org.bukkit.Entity;
 import org.bukkit.Vehicle;
 
 /**
@@ -10,7 +9,15 @@ import org.bukkit.Vehicle;
  * @author sk89q
  */
 public abstract class CraftVehicle extends CraftEntity implements Vehicle {
-    public CraftVehicle(CraftServer server, Entity entity) {
+    public CraftVehicle(CraftServer server, net.minecraft.server.Entity entity) {
         super(server, entity);
     }
+
+    public Entity getPassenger() {
+        return ((CraftWorld)getWorld()).toCraftEntity(getHandle().j);
+    }
+
+    public boolean isEmpty() {
+        return getHandle().j == null;
+    }
 }