1 files changed, 53 insertions, 34 deletions

diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
index 459eee60a..81e8f6e9e 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
@@ -1,52 +1,54 @@
 package com.earth2me.essentials.spawn;
 
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.IEssentials;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerListener;
 import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class EssentialsSpawnPlayerListener extends PlayerListener
 {
 	private final transient IEssentials ess;
+	private final transient SpawnStorage spawns;
+	private static final Logger LOGGER = Bukkit.getLogger();
 
-	public EssentialsSpawnPlayerListener(IEssentials ess)
+	public EssentialsSpawnPlayerListener(final IEssentials ess, final SpawnStorage spawns)
 	{
+		super();
 		this.ess = ess;
+		this.spawns = spawns;
 	}
 
 	@Override
 	public void onPlayerRespawn(final PlayerRespawnEvent event)
-	{
+	{		
 		final User user = ess.getUser(event.getPlayer());
 
-		try
+		if (ess.getSettings().getRespawnAtHome())
 		{
-			if (ess.getSettings().getRespawnAtHome())
+			Location home = user.getHome(user.getLocation());
+			if (home == null)
+			{
+				home = user.getBedSpawnLocation();
+			}
+			if (home != null)
 			{
-				Location home = user.getHome(user.getLocation());
-				if (home == null)
-				{
-					throw new Exception();
-				}
 				event.setRespawnLocation(home);
 				return;
 			}
 		}
-		catch (Throwable ex)
-		{
-		}
-		Location spawn = ess.getSpawn().getSpawn(user.getGroup());
-		if (spawn == null)
+		final Location spawn = spawns.getSpawn(user.getGroup());
+		if (spawn != null)
 		{
-			return;
+			event.setRespawnLocation(spawn);
 		}
-		event.setRespawnLocation(spawn);
 	}
 
 	@Override
@@ -54,32 +56,49 @@ public class EssentialsSpawnPlayerListener extends PlayerListener
 	{
 		final User user = ess.getUser(event.getPlayer());
 
-		if (!user.isNew())
+		if (user.hasPlayedBefore())
 		{
+			LOGGER.log(Level.FINE, "Old player join");
 			return;
-		}
-		user.setNew(false);
+		}		
 		if (!"none".equalsIgnoreCase(ess.getSettings().getNewbieSpawn()))
 		{
-			ess.scheduleSyncDelayedTask(new Runnable()
-			{
-				public void run()
-				{
-					try
-					{
-						user.getTeleport().now(ess.getSpawn().getSpawn(ess.getSettings().getNewbieSpawn()));
-					}
-					catch (Exception ex)
-					{
-						Logger.getLogger("Minecraft").log(Level.WARNING, Util.i18n("teleportNewPlayerError"), ex);
-					}
-				}
-			});
+			ess.scheduleSyncDelayedTask(new NewPlayerTeleport(user), 1L);
 		}
 
 		if (ess.getSettings().getAnnounceNewPlayers())
 		{
 			ess.broadcastMessage(user, ess.getSettings().getAnnounceNewPlayerFormat(user));
 		}
+		
+		LOGGER.log(Level.FINE, "New player join");
+	}
+
+
+	private class NewPlayerTeleport implements Runnable
+	{
+		private final transient User user;
+
+		public NewPlayerTeleport(final User user)
+		{
+			this.user = user;
+		}
+
+		@Override
+		public void run()
+		{
+			try
+			{
+				Location spawn = spawns.getSpawn(ess.getSettings().getNewbieSpawn());
+				if (spawn != null)
+				{
+					user.getTeleport().now(spawn, false, TeleportCause.PLUGIN);
+				}
+			}
+			catch (Exception ex)
+			{
+				Bukkit.getLogger().log(Level.WARNING, _("teleportNewPlayerError"), ex);
+			}
+		}
 	}
 }