From 6cf9098868312d0b36d20b135d228292e9fa7ced Mon Sep 17 00:00:00 2001 From: ItsHarry Date: Thu, 5 Dec 2013 21:58:11 +0100 Subject: [PATCH] Allow Teleportation of Vehicles and Passengers diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index a85b08e..5fe8276 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -431,9 +431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return false; } - if (entity.vehicle != null || entity.passenger != null) { - return false; - } + // Spigot Start + // if (entity.vehicle != null || entity.passenger != null) { + // return false; + // } + // Spigot End // From = Players current Location Location from = this.getLocation(); @@ -447,6 +449,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (event.isCancelled()) { return false; } + + // Spigot Start + eject(); + leaveVehicle(); + // Spigot End // Update the From Location from = event.getFrom(); -- 1.8.4.msysgit.0