From 455c5d71c4f728360a4d13cc9e8c07fd404db511 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Tue, 30 Jun 2020 10:03:46 +1000
Subject: [PATCH] SPIGOT-5895: PlayerChangedWorldEvent#getFrom is incorrect

By: md_5 <git@md-5.net>
---
 paper-server/nms-patches/EntityPlayer.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-server/nms-patches/EntityPlayer.patch b/paper-server/nms-patches/EntityPlayer.patch
index 41f465a2f4..4c220e70b3 100644
--- a/paper-server/nms-patches/EntityPlayer.patch
+++ b/paper-server/nms-patches/EntityPlayer.patch
@@ -540,7 +540,7 @@
              this.lastFoodSent = -1;
 +
 +            // CraftBukkit start
-+            PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
++            PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
 +            this.world.getServer().getPluginManager().callEvent(changeEvent);
 +            // CraftBukkit end
              return this;