diff options
| author | md_5 <git@md-5.net> | 2018-08-08 18:59:20 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-08-08 18:59:20 +1000 |
| commit | 4487c1f9d9146743e347d7d7d8ae28f08559a273 (patch) | |
| tree | 8e40e79db9ce17884bf19bd6259cb8e894c2ee0d | |
| parent | c4220dc24ff459639108d17aa63be152e3964b79 (diff) | |
| download | craftbukkit-4487c1f9d9146743e347d7d7d8ae28f08559a273.tar craftbukkit-4487c1f9d9146743e347d7d7d8ae28f08559a273.tar.gz craftbukkit-4487c1f9d9146743e347d7d7d8ae28f08559a273.tar.lz craftbukkit-4487c1f9d9146743e347d7d7d8ae28f08559a273.tar.xz craftbukkit-4487c1f9d9146743e347d7d7d8ae28f08559a273.zip | |
SPIGOT-4245, MC-128441: use target world as teleport destination
| -rw-r--r-- | nms-patches/CommandTeleport.patch | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nms-patches/CommandTeleport.patch b/nms-patches/CommandTeleport.patch index 3b5763e9..e57e2d12 100644 --- a/nms-patches/CommandTeleport.patch +++ b/nms-patches/CommandTeleport.patch @@ -1,5 +1,14 @@ --- a/net/minecraft/server/CommandTeleport.java +++ b/net/minecraft/server/CommandTeleport.java +@@ -49,7 +49,7 @@ + while (iterator.hasNext()) { + Entity entity1 = (Entity) iterator.next(); + +- a(commandlistenerwrapper, entity1, commandlistenerwrapper.getWorld(), entity.locX, entity.locY, entity.locZ, EnumSet.noneOf(PacketPlayOutPosition.EnumPlayerTeleportFlags.class), entity.yaw, entity.pitch, (CommandTeleport.a) null); ++ a(commandlistenerwrapper, entity1, (WorldServer) entity.world, entity.locX, entity.locY, entity.locZ, EnumSet.noneOf(PacketPlayOutPosition.EnumPlayerTeleportFlags.class), entity.yaw, entity.pitch, (CommandTeleport.a) null); // SPIGOT-4245, MC-128441 - use target world as destination + } + + if (collection.size() == 1) { @@ -116,9 +116,9 @@ if (entity instanceof EntityPlayer) { entity.stopRiding(); |