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

Forgot to account for code shuffling with player.dat fixes.

Browse Source
This commit is contained in:
EvilSeph 2011-06-17 08:59:03 -04:00
parent 39332e5c87
commit 105cc5393c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -980,18 +980,18 @@ public abstract class Entity {
// CraftBukkit end
// CraftBukkit Start - reset world
org.bukkit.World world = null;
CraftWorld world = null;
if (this instanceof EntityPlayer) {
EntityPlayer entityPlayer = (EntityPlayer) this;
String worldName = nbttagcompound.getString("World");
if (worldName == "") {
world = (org.bukkit.World) ((CraftServer) Bukkit.getServer()).getServer().a(entityPlayer.dimension);
world = ((CraftServer) Bukkit.getServer()).getServer().a(entityPlayer.dimension).getWorld();
} else {
world = Bukkit.getServer().getWorld(worldName);
world = (CraftWorld) Bukkit.getServer().getWorld(worldName);
}
}
a(world == null ? null : ((CraftWorld) world).getHandle());
a(world == null ? null : world.getHandle());
// CraftBukkit End
}