1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayerMP.java b/src/main/java/net/minecraft/server/EntityPlayerMP.java
index ee13cbce..1e1f0b55 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);
     }