From f340eae223477ab25ec23b4a357b2974ac5434d7 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Wed, 12 Jun 2019 18:19:36 +1000 Subject: [PATCH] SPIGOT-5062: end_portal on an non-default end world crashes the server By: md_5 --- paper-server/nms-patches/EntityPlayer.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/paper-server/nms-patches/EntityPlayer.patch b/paper-server/nms-patches/EntityPlayer.patch index 823e78689..aab5a8f13 100644 --- a/paper-server/nms-patches/EntityPlayer.patch +++ b/paper-server/nms-patches/EntityPlayer.patch @@ -342,7 +342,8 @@ + // this.worldChangeInvuln = true; // CraftBukkit - Moved down and into PlayerList#changeDimension DimensionManager dimensionmanager1 = this.dimension; - if (dimensionmanager1 == DimensionManager.THE_END && dimensionmanager == DimensionManager.OVERWORLD) { +- if (dimensionmanager1 == DimensionManager.THE_END && dimensionmanager == DimensionManager.OVERWORLD) { ++ if (dimensionmanager1.getType() == DimensionManager.THE_END && dimensionmanager.getType() == DimensionManager.OVERWORLD) { // CraftBukkit - getType() + this.worldChangeInvuln = true; // CraftBukkit - Moved down from above this.decouple(); this.getWorldServer().removePlayer(this);