From b547153ec6057de5f05552ce9aeff28dc1edbb92 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Fri, 28 Nov 2014 16:30:20 -0600
Subject: [PATCH] Fix a mistake in Teleport w/ passenger/vehicle patch

Along with restoring authorship to the original writer
---
 .../0005-Teleport-passenger-vehicle-with-player.patch         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch b/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch
index 0810ac53b..803069b8f 100644
--- a/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch
+++ b/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch
@@ -1,5 +1,5 @@
 From d5d998345385422fa5f96941068f849fbaa69558 Mon Sep 17 00:00:00 2001
-From: Zach Brown <Zbob750@live.com>
+From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Nov 2014 00:24:18 -0600
 Subject: [PATCH] Teleport passenger/vehicle with player
 
@@ -58,7 +58,7 @@ index 5864a51..2d4398e 100644
 +            vehicle.teleportTo(location, false);
 +            vehicle = vehicle.getBukkitEntity().getHandle();
 +            entity.vehicle = vehicle;
-+            entity.passenger = entity;
++            vehicle.passenger = entity;
 +        }
 +
 +        if (passenger != null) {