From a3f5b24d2c5eeeb0443389226117f0047889ae99 Mon Sep 17 00:00:00 2001
From: snowleo <schneeleo@gmail.com>
Date: Sat, 16 Jul 2011 01:35:30 +0200
Subject: [PATCH] Fix merge error

---
 Essentials/src/com/earth2me/essentials/OfflinePlayer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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()