diff options
| author | EvilSeph <evilseph@unaligned.org> | 2011-06-23 15:41:07 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@unaligned.org> | 2011-06-23 15:41:07 -0400 |
| commit | 22c28e593e797b1761920967689f37e74cc6a14a (patch) | |
| tree | 3965e8956492c858e2d76ff3034e1cf61fd46b32 /src/main/java | |
| parent | 6e746ef79a30db37ec1134b5a1717dd9da15d797 (diff) | |
| download | craftbukkit-22c28e593e797b1761920967689f37e74cc6a14a.tar craftbukkit-22c28e593e797b1761920967689f37e74cc6a14a.tar.gz craftbukkit-22c28e593e797b1761920967689f37e74cc6a14a.tar.lz craftbukkit-22c28e593e797b1761920967689f37e74cc6a14a.tar.xz craftbukkit-22c28e593e797b1761920967689f37e74cc6a14a.zip | |
We build for JDK 1.5.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 5cd8ab1d..e7e8d0e3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -67,7 +67,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { if (world == null) { dead = false; ChunkCoordinates position = null; - if (!spawnWorld.isEmpty()) { + if (spawnWorld != null && !spawnWorld.equals("")) { CraftWorld cw = (CraftWorld) Bukkit.getServer().getWorld(spawnWorld); if (cw != null && M() != null) { world = cw.getHandle(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index b0c8d908..2c48addc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -598,7 +598,7 @@ public final class CraftServer implements Server { if (node != null) { String name = node.getString("generator"); - if ((name != null) && (!name.isEmpty())) { + if ((name != null) && (!name.equals(""))) { String[] split = name.split(":", 2); String id = (split.length > 1) ? split[1] : null; Plugin plugin = pluginManager.getPlugin(split[0]); |