remove merge leftovers

Don't try to spawn users who have disconnected before we have a chance to spawn them

2 files changed, 6 insertions, 4 deletions

diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 389d9c955..18dcfbc71 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -293,11 +293,7 @@ requestDenied=\u00a77Teleport request denied.
 requestDeniedFrom=\u00a77{0} denied your teleport request.
 requestSent=\u00a77Request sent to {0}\u00a77.
 requestTimedOut=\u00a7cTeleport request has timed out
-<<<<<<< HEAD
-requiredBukkit= * ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
-=======
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
->>>>>>> refs/heads/master
 returnPlayerToJailError=Error occurred when trying to return player to jail.
 second=second
 seconds=seconds
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
index 21bd0d499..de58d86ed 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
@@ -7,6 +7,7 @@ import com.earth2me.essentials.api.IUser;
 import java.util.logging.Level;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
@@ -93,6 +94,11 @@ public class EssentialsSpawnPlayerListener implements Listener
 		@Override
 		public void run()
 		{
+			if (user.getBase() instanceof OfflinePlayer)
+			{
+				return;
+			}
+			
 			try
 			{
 				final Location spawn = spawns.getNewbieSpawn();