From dba91d2ab6e9fc63733e38efcb5dc83cdfb755fc Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 9 Jul 2020 19:11:45 +1000
Subject: [PATCH] SPIGOT-5972: PlayerPortalEvent.setTo() when returning through
 an End Portal Crashes Server

---
 nms-patches/EntityPlayer.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch
index fa95b726cc..606b7d1bec 100644
--- a/nms-patches/EntityPlayer.patch
+++ b/nms-patches/EntityPlayer.patch
@@ -475,7 +475,7 @@
 +                exit.setZ(k);
 +                // this.setMot(Vec3D.a);
 +                exitVelocity = Vec3D.a;
-+            } else {
++            } else if (worldserver.getTypeKey() == DimensionManager.THE_NETHER || worldserver1.getTypeKey() == DimensionManager.THE_NETHER) {
 +                ShapeDetector.Shape portalShape = worldserver.getTravelAgent().findAndTeleport(this, exitPosition, f2, event.getSearchRadius(), true);
 +                if (portalShape == null && event.getCanCreatePortal()) {
 +                    if (worldserver.getTravelAgent().createPortal(this, exitPosition, event.getCreationRadius())) { // Only check for new portal if creation succeeded