Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 19:15:32 +01:00
Code Issues Projects Releases Wiki Activity

Fixed logging into the correct world

Browse Source
This commit is contained in:
Dinnerbone 2011-02-07 01:10:55 +00:00
parent 3f8d9c0e1f
commit 7a71347cdf
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/minecraft/server/Entity.java
View File

@ -809,6 +809,7 @@ public abstract class Entity {
nbttagcompound.a("Fire", (short) this.fireTicks);
nbttagcompound.a("Air", (short) this.airTicks);
nbttagcompound.a("OnGround", this.onGround);
nbttagcompound.a("World", world.w); // Craftbukkit
this.a(nbttagcompound);
}
@ -830,6 +831,20 @@ public abstract class Entity {
this.fireTicks = nbttagcompound.c("Fire");
this.airTicks = nbttagcompound.c("Air");
this.onGround = nbttagcompound.l("OnGround");
// Craftbukkit start
if (nbttagcompound.a("World")) {
String worldName = nbttagcompound.h("World");
for (WorldServer world : ((WorldServer)this.world).getServer().getServer().worlds) {
if (world.w.equals(worldName)) {
this.world = world;
break;
}
}
}
// Craftbukkit end
this.a(this.locX, this.locY, this.locZ);
this.b(nbttagcompound);
}

6
src/main/java/net/minecraft/server/ServerConfigurationManager.java
View File

@ -65,7 +65,11 @@ public class ServerConfigurationManager {
}
public void a(WorldServer worldserver) {
this.l = new PlayerNBTManager(new File(worldserver.t, "players"));
// Craftbukkit start
if (this.l == null) {
this.l = new PlayerNBTManager(new File(worldserver.t, "players"));
}
// Craftbukkit end
}
public int a() {