From 4487c1f9d9146743e347d7d7d8ae28f08559a273 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 8 Aug 2018 18:59:20 +1000
Subject: [PATCH] SPIGOT-4245, MC-128441: use target world as teleport
 destination

---
 nms-patches/CommandTeleport.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nms-patches/CommandTeleport.patch b/nms-patches/CommandTeleport.patch
index 3b5763e9f1..e57e2d1250 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();