mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 06:50:12 +01:00
Fix crash with disabled worlds
This commit is contained in:
parent
de42aa13f3
commit
4633e6c5c7
1 changed files with 3 additions and 5 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue