Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generic cleanup

Browse Source
This commit is contained in:
Erik Broes
2011-06-12 00:02:58 +02:00
parent 938db4de2d
commit 96b1b8a10c
37 changed files with 667 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,20 +68,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
dead = false;
ChunkCoordinates position = null;
if (!spawnWorld.isEmpty()) {
CraftWorld cw = (CraftWorld)Bukkit.getServer().getWorld(spawnWorld);
CraftWorld cw = (CraftWorld) Bukkit.getServer().getWorld(spawnWorld);
if (cw != null && M() != null) {
world = cw.getHandle();
position = EntityHuman.getBed(cw.getHandle(), M());
}
}
if (world == null || position == null) {
world = ((CraftWorld)Bukkit.getServer().getWorlds().get(0)).getHandle();
world = ((CraftWorld) Bukkit.getServer().getWorlds().get(0)).getHandle();
position = world.getSpawn();
}
this.world = world;
setPosition(position.x + 0.5, position.y, position.z + 0.5);
setPosition(position.x + 0.5, position.y, position.z + 0.5);
}
this.dimension = ((WorldServer)this.world).dimension;
this.dimension = ((WorldServer) this.world).dimension;
// CraftBukkit end
this.itemInWorldManager = new ItemInWorldManager((WorldServer) world);
this.itemInWorldManager.player = this;