From e58a088765599fe9b7877839290c65b518722d74 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 5 Jul 2020 09:00:43 +1000
Subject: [PATCH] SPIGOT-5939: EntityPortalEnterEvent not fired for end portal
 if end disabled

---
 nms-patches/BlockEnderPortal.patch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nms-patches/BlockEnderPortal.patch b/nms-patches/BlockEnderPortal.patch
index 84f9409b3a..9338d0cf17 100644
--- a/nms-patches/BlockEnderPortal.patch
+++ b/nms-patches/BlockEnderPortal.patch
@@ -11,8 +11,12 @@
  public class BlockEnderPortal extends BlockTileEntity {
  
      protected static final VoxelShape a = Block.a(0.0D, 0.0D, 0.0D, 16.0D, 12.0D, 16.0D);
-@@ -28,6 +33,15 @@
-                 return;
+@@ -25,9 +30,18 @@
+             WorldServer worldserver = ((WorldServer) world).getMinecraftServer().getWorldServer(resourcekey);
+ 
+             if (worldserver == null) {
+-                return;
++                // return; // CraftBukkit - always fire event in case plugins wish to change it
              }
  
 +            // CraftBukkit start - Entity in portal