summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorementalo <suror@gmx.co.uk>2012-01-24 22:43:33 +0000
committerementalo <suror@gmx.co.uk>2012-01-24 22:43:33 +0000
commit0a05cda9bc30be4d2f8f0a1f76da61a5eeed76a0 (patch)
tree5091cedde733b985cd1eb46e4ef9edf7a1e2f54b
parent08b4b9f0b58bbbf2797c6e5d44f122a7f23a6686 (diff)
downloadEssentials-0a05cda9bc30be4d2f8f0a1f76da61a5eeed76a0.tar
Essentials-0a05cda9bc30be4d2f8f0a1f76da61a5eeed76a0.tar.gz
Essentials-0a05cda9bc30be4d2f8f0a1f76da61a5eeed76a0.tar.lz
Essentials-0a05cda9bc30be4d2f8f0a1f76da61a5eeed76a0.tar.xz
Essentials-0a05cda9bc30be4d2f8f0a1f76da61a5eeed76a0.zip
Don't try to spawn users who have disconnected before we have a chance to spawn them
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
index 2814714a2..7ec9ee043 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
@@ -2,6 +2,7 @@ package com.earth2me.essentials.spawn;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IEssentials;
+import com.earth2me.essentials.OfflinePlayer;
import com.earth2me.essentials.User;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -27,7 +28,7 @@ public class EssentialsSpawnPlayerListener implements Listener
}
public void onPlayerRespawn(final PlayerRespawnEvent event)
- {
+ {
final User user = ess.getUser(event.getPlayer());
if (ess.getSettings().getRespawnAtHome())
@@ -58,7 +59,7 @@ public class EssentialsSpawnPlayerListener implements Listener
{
LOGGER.log(Level.FINE, "Old player join");
return;
- }
+ }
if (!"none".equalsIgnoreCase(ess.getSettings().getNewbieSpawn()))
{
ess.scheduleSyncDelayedTask(new NewPlayerTeleport(user), 1L);
@@ -68,7 +69,7 @@ public class EssentialsSpawnPlayerListener implements Listener
{
ess.broadcastMessage(user, ess.getSettings().getAnnounceNewPlayerFormat(user));
}
-
+
LOGGER.log(Level.FINE, "New player join");
}
@@ -85,6 +86,11 @@ public class EssentialsSpawnPlayerListener implements Listener
@Override
public void run()
{
+ if (user.getBase() instanceof OfflinePlayer)
+ {
+ return;
+ }
+
try
{
Location spawn = spawns.getSpawn(ess.getSettings().getNewbieSpawn());