Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-12 15:08:27 +02:00
Code Issues Projects Releases Wiki Activity

Cross World Entity Teleportation

Browse Source 
Use Entity.teleportTo for cross-world teleportation in CraftEntity.
This commit is contained in:
Andrew Krieger 2019-01-05 16:21:07 +11:00 committed by md_5
parent 7deba1c606
commit 6e842759cc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@ -306,7 +306,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// If this entity is riding another entity, we must dismount before teleporting.
entity.stopRiding();
entity.world = ((CraftWorld) location.getWorld()).getHandle();
// Let the server handle cross world teleports
if (!location.getWorld().equals(getWorld())) {
entity.teleportTo(location, cause == TeleportCause.NETHER_PORTAL);
return true;
}
// entity.setLocation() throws no event, and so cannot be cancelled
entity.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
// SPIGOT-619: Force sync head rotation also