diff --git a/patches/server/0044-Teleport-with-vehicle-passenger.patch b/patches/server/0044-Teleport-with-vehicle-passenger.patch index 2b561eb2c..213667300 100644 --- a/patches/server/0044-Teleport-with-vehicle-passenger.patch +++ b/patches/server/0044-Teleport-with-vehicle-passenger.patch @@ -1,26 +1,18 @@ -From fc68549f17bcf959307b34c412f3336c99f65021 Mon Sep 17 00:00:00 2001 +From 8a8144d39ecf8d43839857ec8f7902d7b080af38 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 7 Jul 2019 18:25:05 -0500 Subject: [PATCH] Teleport with vehicle/passenger --- - .../craftbukkit/entity/CraftEntity.java | 21 +++++++++++++++++-- + .../craftbukkit/entity/CraftEntity.java | 20 +++++++++++++++++-- .../craftbukkit/entity/CraftPlayer.java | 4 +++- - 2 files changed, 22 insertions(+), 3 deletions(-) + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 15042943c9..4dac433fa4 100644 +index 15042943c9..9782c510aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -9,6 +9,7 @@ import java.util.UUID; - import net.minecraft.server.AxisAlignedBB; - import net.minecraft.server.BlockPosition; - import net.minecraft.server.DamageSource; -+import net.minecraft.server.DimensionManager; - import net.minecraft.server.Entity; - import net.minecraft.server.EntityAmbient; - import net.minecraft.server.EntityAnimal; -@@ -494,16 +495,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -494,16 +494,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { Preconditions.checkArgument(location != null, "location"); location.checkFinite(); @@ -38,7 +30,7 @@ index 15042943c9..4dac433fa4 100644 if (!location.getWorld().equals(getWorld())) { - entity.teleportTo(((CraftWorld) location.getWorld()).getHandle().getWorldProvider().getDimensionManager(), new BlockPosition(location.getX(), location.getY(), location.getZ())); + // Purpur start -+ DimensionManager dimension = ((CraftWorld) location.getWorld()).getHandle().getWorldProvider().getDimensionManager(); ++ net.minecraft.server.DimensionManager dimension = ((CraftWorld) location.getWorld()).getHandle().getWorldProvider().getDimensionManager(); + BlockPosition position = new BlockPosition(location.getX(), location.getY(), location.getZ()); + if(entity.isVehicle()) { + Entity passenger = entity.getPassengers().get(0);