From e6e50ddf9b7cb9fe4fb5e8102acf117db2db6f2a Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Wed, 12 Jan 2011 22:39:15 -0800
Subject: [PATCH] Fixed Vehicle.eject() not ejecting players properly.

---
 .../java/net/minecraft/server/EntityPlayerMP.java     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraft/server/EntityPlayerMP.java b/src/main/java/net/minecraft/server/EntityPlayerMP.java
index ee13cbce28..1e1f0b5580 100644
--- a/src/main/java/net/minecraft/server/EntityPlayerMP.java
+++ b/src/main/java/net/minecraft/server/EntityPlayerMP.java
@@ -194,7 +194,16 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting {
     }
 
     public void e(Entity entity) {
-        super.e(entity);
+        // CraftBukkit start
+        setPassengerOf(entity);
+    }
+
+    public void setPassengerOf(Entity entity) {
+        // e(null) doesn't really fly for overloaded methods,
+        // so this method is needed
+
+        //CraftBukkit end
+        super.setPassengerOf(entity);
         a.b(((Packet) (new Packet39(((Entity) (this)), k))));
         a.a(p, q, r, v, w);
     }