2014-08-04 20:11:38 +00:00
|
|
|
From 81b0beb9e6bceb7a05a843bbe59ec6e20425bd38 Mon Sep 17 00:00:00 2001
|
2014-07-21 20:46:54 +00:00
|
|
|
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 96d763b..26a6253 100644
|
|
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
|
@@ -205,7 +205,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- 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;
|
|
|
|
|
--
|
|
|
|
|
1.9.1
|
|
|
|
|
|
