From 897d6a7ea5519b00d73f417fb560a36f74fd68ef Mon Sep 17 00:00:00 2001 From: ItsHarry Date: Thu, 5 Dec 2013 21:59:53 +0100 Subject: [PATCH] Allow Teleportation of Vehicles and Passengers --- ...portation-of-Vehicles-and-Passengers.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 CraftBukkit-Patches/0074-Allow-Teleportation-of-Vehicles-and-Passengers.patch diff --git a/CraftBukkit-Patches/0074-Allow-Teleportation-of-Vehicles-and-Passengers.patch b/CraftBukkit-Patches/0074-Allow-Teleportation-of-Vehicles-and-Passengers.patch new file mode 100644 index 0000000000..609c7e35cd --- /dev/null +++ b/CraftBukkit-Patches/0074-Allow-Teleportation-of-Vehicles-and-Passengers.patch @@ -0,0 +1,40 @@ +From 2493d28198b0053b6a41042553450e9cda2603ca 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 f870cc6..5635c35 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +@@ -430,9 +430,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(); +@@ -446,6 +448,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.3.msysgit.0 +