41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
|
From 939807f8187bbeddaad80e17a6f9b5aff5d37b26 Mon Sep 17 00:00:00 2001
|
||
|
|
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
|
||
|
|
index af2ee8c..217d5dd 100644
|
||
|
|
--- 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();
|
||
|
|
--
|
||
|
|
1.8.3.2
|
||
|
|
|