Fix crash with disabled worlds

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2019-12-11 12:36:03 +11:00
parent 0e142c7f03
commit 41210f86bb

View file

@ -355,20 +355,18 @@
this.decouple();
this.getWorldServer().removePlayer(this);
if (!this.viewingCredits) {
@@ -503,10 +697,12 @@
@@ -503,8 +697,10 @@
} else {
WorldServer worldserver = this.server.getWorldServer(dimensionmanager1);
- this.dimension = dimensionmanager;
+ // this.dimension = dimensionmanager; // CraftBukkit
WorldServer worldserver1 = this.server.getWorldServer(dimensionmanager);
WorldData worlddata = worldserver1.getWorldData();
+ // CraftBukkit start
+ /*
WorldData worlddata = worldserver1.getWorldData();
this.playerConnection.sendPacket(new PacketPlayOutRespawn(dimensionmanager, WorldData.c(worlddata.getSeed()), worlddata.getType(), this.playerInteractManager.getGameMode()));
this.playerConnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
PlayerList playerlist = this.server.getPlayerList();
@@ -514,6 +710,8 @@
playerlist.d(this);
worldserver.removePlayer(this);