mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 13:06:02 +01:00
Allow Teleportation of Vehicles and Passengers
This commit is contained in:
parent
83a93937f7
commit
897d6a7ea5
@ -0,0 +1,40 @@
|
|||||||
|
From 2493d28198b0053b6a41042553450e9cda2603ca 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 f870cc6..5635c35 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
@@ -430,9 +430,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();
|
||||||
|
@@ -446,6 +448,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.msysgit.0
|
||||||
|
|
Loading…
Reference in New Issue
Block a user