From 1610f6d153aefbda1bed6600b2ae0dd5fce1bbd0 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 30 Nov 2014 22:35:33 -0600
Subject: [PATCH] Improvements to teleport with passenger vehicle

---
 .../Teleport-passenger-vehicle-with-player.patch     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch
index 90a062949..66ae99d4c 100644
--- a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch
+++ b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch
@@ -47,10 +47,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         // If this player is riding another entity, we must dismount before teleporting.
-         entity.mount(null);
+         }
  
+         // If this player is riding another entity, we must dismount before teleporting.
+-        entity.mount(null);
 +        // PaperSpigot start
++        entity.mount(null); // Comment out when fully working, until then leave this
++
 +        Entity vehicle = entity.vehicle;
 +        Entity passenger = entity.passenger;
 +        if (vehicle != null) {
@@ -66,13 +69,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            passenger.teleportTo(location, false);
 +            passenger = passenger.getBukkitEntity().getHandle();
 +            entity.passenger = passenger;
-+            entity.vehicle = entity;
++            passenger.vehicle = entity;
 +        }
 +        // PaperSpigot end
-+
+ 
          // Update the From Location
          from = event.getFrom();
-         // Grab the new To Location dependent on whether the event was cancelled.
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          } else {
              server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);