Moved getVehicle, leaveVehicle and isInsideVehicle from LivingEntity to Entity. Addresses BUKKIT-811

2 files changed, 24 insertions, 33 deletions

diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index d9d219b3..dc10fc4d 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -233,4 +233,28 @@ public interface Entity extends Metadatable {
      * @return The entity type.
      */
     public EntityType getType();
+
+    /**
+     * Returns whether this entity is inside a vehicle.
+     *
+     * @return True if the entity is in a vehicle.
+     */
+    public boolean isInsideVehicle();
+
+    /**
+     * Leave the current vehicle. If the entity is currently in a vehicle
+     * (and is removed from it), true will be returned, otherwise false will
+     * be returned.
+     *
+     * @return True if the entity was in a vehicle.
+     */
+    public boolean leaveVehicle();
+
+    /**
+     * Get the vehicle that this player is inside. If there is no vehicle,
+     * null will be returned.
+     *
+     * @return The current vehicle.
+     */
+    public Entity getVehicle();
 }
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 3c0f4cae..0ffefa5e 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -115,39 +115,6 @@ public interface LivingEntity extends Entity {
     public Arrow shootArrow();
 
     /**
-     * Launches a {@link Projectile} from the entity.
-     *
-     * @param projectile Class of the projectile to launch
-     *
-     * @return The launched projectile.
-     */
-    public <T extends Projectile> T launchProjectile(Class<? extends T> projectile);
-
-    /**
-     * Returns whether this entity is inside a vehicle.
-     *
-     * @return True if the entity is in a vehicle.
-     */
-    public boolean isInsideVehicle();
-
-    /**
-     * Leave the current vehicle. If the entity is currently in a vehicle
-     * (and is removed from it), true will be returned, otherwise false will
-     * be returned.
-     *
-     * @return True if the entity was in a vehicle.
-     */
-    public boolean leaveVehicle();
-
-    /**
-     * Get the vehicle that this player is inside. If there is no vehicle,
-     * null will be returned.
-     *
-     * @return The current vehicle.
-     */
-    public Vehicle getVehicle();
-
-    /**
      * Returns the amount of air that this entity has remaining, in ticks
      *
      * @return Amount of air remaining