SPIGOT-5939: EntityPortalEnterEvent not fired for end portal if end disabled

This commit is contained in:
md_5 2020-07-05 09:00:43 +10:00
parent 833047174f
commit e58a088765
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11

View File

@ -11,8 +11,12 @@
public class BlockEnderPortal extends BlockTileEntity { public class BlockEnderPortal extends BlockTileEntity {
protected static final VoxelShape a = Block.a(0.0D, 0.0D, 0.0D, 16.0D, 12.0D, 16.0D); protected static final VoxelShape a = Block.a(0.0D, 0.0D, 0.0D, 16.0D, 12.0D, 16.0D);
@@ -28,6 +33,15 @@ @@ -25,9 +30,18 @@
return; 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 + // CraftBukkit start - Entity in portal