From 57b1b5061031b86e5914dc9f9005253565b5a2b4 Mon Sep 17 00:00:00 2001
From: Erik Broes <erikbroes@grum.nl>
Date: Tue, 29 Mar 2011 23:09:05 +0200
Subject: [PATCH] Move passenger-handling to Entity

---
 src/main/java/org/bukkit/entity/Entity.java  | 30 ++++++++++++++++++++
 src/main/java/org/bukkit/entity/Vehicle.java | 30 --------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index a7adc54a..987c7cd3 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -109,4 +109,34 @@ public interface Entity {
      * @return Server instance running this Entity
      */
     public Server getServer();
+
+    /**
+     * Gets the primary passenger of a vehicle. For vehicles that could have
+     * multiple passengers, this will only return the primary passenger.
+     * 
+     * @return an entity
+     */
+    public abstract Entity getPassenger();
+
+    /**
+     * Set the passenger of a vehicle.
+     * 
+     * @param passenger
+     * @return false if it could not be done for whatever reason
+     */
+    public abstract boolean setPassenger(Entity passenger);
+
+    /**
+     * Returns true if the vehicle has no passengers.
+     * 
+     * @return
+     */
+    public abstract boolean isEmpty();
+
+    /**
+     * Eject any passenger. True if there was a passenger.
+     * 
+     * @return
+     */
+    public abstract boolean eject();
 }
diff --git a/src/main/java/org/bukkit/entity/Vehicle.java b/src/main/java/org/bukkit/entity/Vehicle.java
index 36738651..6cad4be3 100644
--- a/src/main/java/org/bukkit/entity/Vehicle.java
+++ b/src/main/java/org/bukkit/entity/Vehicle.java
@@ -21,34 +21,4 @@ public interface Vehicle extends Entity {
      * @param vel velocity vector
      */
     public void setVelocity(Vector vel);
-    
-    /**
-     * Gets the primary passenger of a vehicle. For vehicles that could have
-     * multiple passengers, this will only return the primary passenger.
-     * 
-     * @return an entity
-     */
-    public Entity getPassenger();
-    
-    /**
-     * Set the passenger of a vehicle.
-     * 
-     * @param passenger
-     * @return false if it could not be done for whatever reason
-     */
-    public boolean setPassenger(Entity passenger);
-    
-    /**
-     * Returns true if the vehicle has no passengers.
-     * 
-     * @return
-     */
-    public boolean isEmpty();
-    
-    /**
-     * Eject any passenger. True if there was a passenger.
-     * 
-     * @return
-     */
-    public boolean eject();
 }