Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 12:05:53 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash with disabled worlds

Browse Source
This commit is contained in:
md_5 2019-12-11 12:36:03 +11:00
parent de42aa13f3
commit 4633e6c5c7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nms-patches/EntityPlayer.patch
View File

@ -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);