mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-23 13:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove debugging from last commit

Browse Source
This commit is contained in:
William Blake Galbreath 2019-07-07 19:09:05 -05:00
parent ed377335f5
commit 26cac543f7
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
patches/server/0045-Teleport-with-vehicle-passenger.patch
View File

@ -1,18 +1,18 @@
From da89815b34a96bb0cefe3a1ae47350ddae67bd60 Mon Sep 17 00:00:00 2001
From 9a32aad9bf45cc48458b9ec1615342915b48c8a7 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
---
.../org/bukkit/craftbukkit/entity/CraftEntity.java | 12 +++++++++++-
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 12 +++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
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..f0ca40095 100644
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,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -494,10 +494,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
Preconditions.checkArgument(location != null, "location");
location.checkFinite();
@ -21,21 +21,13 @@ index 15042943c..f0ca40095 100644
return false;
}
+ // Purpur start
+ if (entity.getVehicle() != null) {
+ System.out.println("1");
+ if (entity.getVehicle().getVehicle() == null) {
+ System.out.println("2");
+ return entity.getVehicle().getBukkitEntity().teleport(location, cause);
+ }
+ }
+ // Purpur end
+ 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..221e5340c 100644
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 {
@ -47,19 +39,11 @@ index c94944dfe..221e5340c 100644
return false;
}
@@ -769,6 +769,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -769,6 +769,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return false;
}
+ // Purpur start
+ if (entity.getVehicle() != null) {
+ System.out.println("1");
+ if (entity.getVehicle().getVehicle() == null) {
+ System.out.println("2");
+ return entity.getVehicle().getBukkitEntity().teleport(location, cause);
+ }
+ }
+ // Purpur end
+ 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();