Paper/CraftBukkit-Patches/0061-Allow-Teleportation-of-Vehicles-and-Passengers.patch

41 lines
1.3 KiB
Diff
Raw Normal View History

2014-04-19 01:15:23 +02:00
From a55476375d2ede32ed8c70f6d84e769710e91770 Mon Sep 17 00:00:00 2001
2014-04-12 06:18:37 +02:00
From: ItsHarry <info@itsjerryandharry.com>
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
2014-04-19 01:15:23 +02:00
index a63db3b..317e14f 100644
2014-04-12 06:18:37 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -459,9 +459,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();
@@ -475,6 +477,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();
--
2014-04-19 01:15:23 +02:00
1.9.1
2014-04-12 06:18:37 +02:00