diff options
| author | snowleo <schneeleo@gmail.com> | 2011-07-16 01:35:30 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-07-16 01:35:30 +0200 |
| commit | ad8ad8b574e3734269c2c0adba4dd52aa476c1bb (patch) | |
| tree | b199610eb3eba85735e0a165f9c019fdce7ffe77 | |
| parent | 3c28dabfad99de93a4fa7251dc3f1c5f9ac13340 (diff) | |
| download | Essentials-ad8ad8b574e3734269c2c0adba4dd52aa476c1bb.tar Essentials-ad8ad8b574e3734269c2c0adba4dd52aa476c1bb.tar.gz Essentials-ad8ad8b574e3734269c2c0adba4dd52aa476c1bb.tar.lz Essentials-ad8ad8b574e3734269c2c0adba4dd52aa476c1bb.tar.xz Essentials-ad8ad8b574e3734269c2c0adba4dd52aa476c1bb.zip | |
Fix merge error
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/OfflinePlayer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java index 2d3e49170..ff0b73fbd 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java @@ -31,13 +31,14 @@ public class OfflinePlayer implements Player private final String name; final transient IEssentials ess; private Location location = new Location(null, 0, 0, 0, 0, 0); - private World world = ess.getServer().getWorlds().get(0); + private World world; private UUID uniqueId = UUID.randomUUID(); public OfflinePlayer(String name, IEssentials ess) { this.name = name; this.ess = ess; + this.world = ess.getServer().getWorlds().get(0); } public boolean isOnline() |