From 404d0946d641678fcf2d12de3603f100d4cb0ebf Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sun, 5 Jul 2020 10:32:31 +1000
Subject: [PATCH] Fix end portals in custom ends

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 278477b7c1..fa95b726cc 100644
--- a/paper-server/nms-patches/EntityPlayer.patch
+++ b/paper-server/nms-patches/EntityPlayer.patch
@@ -371,7 +371,7 @@
 +        ResourceKey<DimensionManager> resourcekey = worldserver1.getTypeKey(); // CraftBukkit
  
 -        if (resourcekey == World.THE_END && worldserver.getDimensionKey() == World.OVERWORLD) {
-+        if (resourcekey == DimensionManager.THE_END && worldserver.getTypeKey() == DimensionManager.OVERWORLD) { // CraftBukkit
++        if (resourcekey == DimensionManager.THE_END && worldserver != null && worldserver.getTypeKey() == DimensionManager.OVERWORLD) { // CraftBukkit
 +            this.worldChangeInvuln = true; // CraftBukkit - Moved down from above
              this.decouple();
              this.getWorldServer().removePlayer(this);