SPIGOT-5062: end_portal on an non-default end world crashes the server

This commit is contained in:
md_5 2019-06-12 18:19:36 +10:00
parent 4a07dc69d0
commit 28ea3fd105

View file

@ -342,7 +342,8 @@
+ // this.worldChangeInvuln = true; // CraftBukkit - Moved down and into PlayerList#changeDimension + // this.worldChangeInvuln = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
DimensionManager dimensionmanager1 = this.dimension; 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.worldChangeInvuln = true; // CraftBukkit - Moved down from above
this.decouple(); this.decouple();
this.getWorldServer().removePlayer(this); this.getWorldServer().removePlayer(this);