From 2cbc92c37e66d2baf960219c9f3bdc155e6cf2c7 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.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 --- .../Teleport-passenger-vehicle-with-player.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch index 952ac17476..90a062949b 100644 --- a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch +++ b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zach Brown <1254957+zachbr@users.noreply.github.com> +From: Aikar Date: Fri, 28 Nov 2014 00:24:18 -0600 Subject: [PATCH] Teleport passenger/vehicle with player @@ -58,7 +58,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + vehicle.teleportTo(location, false); + vehicle = vehicle.getBukkitEntity().getHandle(); + entity.vehicle = vehicle; -+ entity.passenger = entity; ++ vehicle.passenger = entity; + } + + if (passenger != null) {