mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 03:43:40 +01:00
Fix crash with disabled worlds
By: md_5 <git@md-5.net>
This commit is contained in:
parent
0e142c7f03
commit
41210f86bb
1 changed files with 3 additions and 5 deletions
|
@ -355,20 +355,18 @@
|
||||||
this.decouple();
|
this.decouple();
|
||||||
this.getWorldServer().removePlayer(this);
|
this.getWorldServer().removePlayer(this);
|
||||||
if (!this.viewingCredits) {
|
if (!this.viewingCredits) {
|
||||||
@@ -503,10 +697,12 @@
|
@@ -503,8 +697,10 @@
|
||||||
} else {
|
} else {
|
||||||
WorldServer worldserver = this.server.getWorldServer(dimensionmanager1);
|
WorldServer worldserver = this.server.getWorldServer(dimensionmanager1);
|
||||||
|
|
||||||
- this.dimension = dimensionmanager;
|
- this.dimension = dimensionmanager;
|
||||||
+ // this.dimension = dimensionmanager; // CraftBukkit
|
+ // this.dimension = dimensionmanager; // CraftBukkit
|
||||||
WorldServer worldserver1 = this.server.getWorldServer(dimensionmanager);
|
WorldServer worldserver1 = this.server.getWorldServer(dimensionmanager);
|
||||||
WorldData worlddata = worldserver1.getWorldData();
|
|
||||||
|
|
||||||
+ // CraftBukkit start
|
+ // 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 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 @@
|
@@ -514,6 +710,8 @@
|
||||||
playerlist.d(this);
|
playerlist.d(this);
|
||||||
worldserver.removePlayer(this);
|
worldserver.removePlayer(this);
|
||||||
|
|
Loading…
Reference in a new issue