mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
378bbf478c
Upstream has released updates that appears to apply and compile correctly Paper Changes: 8812fed9 Merge pull request #2240 from Spottedleaf/anti-xray bd46b639 Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray e679a7c1 Config migrations 0a667728 Resolve crash issue by shoving chunk loads onto the next tick 3a2d7f2d Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray 5ffa0dae Do not force load chunks for plugin constructed packets e993aa6f Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray 9a4a185f Keep neighbour chunks loaded while obfuscating f1f8060a Fix build? 76eb2a5e Use getChunkIfLoadedImmediately not getChunkIfCachedImmediately ad757f96 Delete 0335-Anti-Xray.patch 46a6f1b2 Re-Add Anti-Xray
54 lines
2.2 KiB
Diff
54 lines
2.2 KiB
Diff
From cfc0e6ba5c3aca2801275d1785a62d7f8a9efad7 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sun, 7 Jul 2019 18:25:05 -0500
|
|
Subject: [PATCH] Teleport with vehicle/passenger
|
|
|
|
---
|
|
src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java | 4 +++-
|
|
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 4 +++-
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
index 15042943c..45e16f8e9 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -494,10 +494,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
|
Preconditions.checkArgument(location != null, "location");
|
|
location.checkFinite();
|
|
|
|
- if (entity.isVehicle() || entity.dead) {
|
|
+ if (entity.dead) { // Purpur
|
|
return false;
|
|
}
|
|
|
|
+ if (entity.isVehicle() && !entity.getVehicle().isVehicle()) return entity.getVehicle().getBukkitEntity().teleport(location, cause); // Purpur
|
|
+
|
|
// If this entity is riding another entity, we must dismount before teleporting.
|
|
entity.stopRiding();
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index c94944dfe..992a061a0 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -752,7 +752,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
return false;
|
|
}
|
|
|
|
- if (entity.isVehicle()) {
|
|
+ if (false && entity.isVehicle()) { // Purpur
|
|
return false;
|
|
}
|
|
|
|
@@ -769,6 +769,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
return false;
|
|
}
|
|
|
|
+ if (entity.isVehicle() && !entity.getVehicle().isVehicle()) return entity.getVehicle().getBukkitEntity().teleport(location, cause); // Purpur
|
|
+
|
|
// If this player is riding another entity, we must dismount before teleporting.
|
|
entity.stopRiding();
|
|
|
|
--
|
|
2.20.1
|
|
|