Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
31 Zeilen
1.4 KiB
Diff
31 Zeilen
1.4 KiB
Diff
From aaa2c88a63db57c293bbd1440827602c72d2b4cd Mon Sep 17 00:00:00 2001
|
|
From: Andrew Krieger <Slizyboy@hotmail.com>
|
|
Date: Tue, 24 Dec 2013 07:55:23 -0800
|
|
Subject: [PATCH] Cross World Entity Teleportation
|
|
|
|
Use Entity.teleportTo for cross-world teleportation in CraftEntity.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
index 0234fe3..efbf1a8 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -234,7 +234,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
|
// If this entity is riding another entity, we must dismount before teleporting.
|
|
entity.mount(null);
|
|
|
|
- entity.world = ((CraftWorld) location.getWorld()).getHandle();
|
|
+ // Spigot start
|
|
+ if (!location.getWorld().equals(getWorld())) {
|
|
+ entity.teleportTo(location, cause.equals(TeleportCause.NETHER_PORTAL));
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ // entity.world = ((CraftWorld) location.getWorld()).getHandle();
|
|
+ // Spigot end
|
|
entity.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
|
|
// entity.setLocation() throws no event, and so cannot be cancelled
|
|
return true;
|
|
--
|
|
2.1.4
|
|
|