diff options
Diffstat (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java')
| -rw-r--r-- | EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 0b670090a..2f86be05d 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -14,11 +14,11 @@ public class EssentialsSpawnPlayerListener extends PlayerListener @Override public void onPlayerRespawn(PlayerRespawnEvent event) { - User user = User.get(event.getPlayer()); + User user = Essentials.getStatic().getUser(event.getPlayer()); try { - if (Essentials.getSettings().getRespawnAtHome()) + if (Essentials.getStatic().getSettings().getRespawnAtHome()) { event.setRespawnLocation(user.getHome()); return; @@ -27,23 +27,28 @@ public class EssentialsSpawnPlayerListener extends PlayerListener catch (Throwable ex) { } - event.setRespawnLocation(Essentials.getStatic().spawn.getSpawn(user.getGroup())); + event.setRespawnLocation(Essentials.getSpawn().getSpawn(user.getGroup())); } @Override public void onPlayerJoin(PlayerJoinEvent event) { - User user = User.get(event.getPlayer()); + User user = Essentials.getStatic().getUser(event.getPlayer()); - if (!user.isNew()) return; - user.clearNewFlag(); + if (!user.isNew()) + { + return; + } + user.setNew(false); try { - user.teleportToNow(Essentials.getStatic().spawn.getSpawn(Essentials.getSettings().getNewbieSpawn())); + user.getTeleport().now(Essentials.getSpawn().getSpawn(Essentials.getStatic().getSettings().getNewbieSpawn())); } catch (Exception ex) { Logger.getLogger("Minecraft").log(Level.WARNING, "Failed to teleport new player", ex); } - if (Essentials.getSettings().getAnnounceNewPlayers()) - Essentials.getStatic().getServer().broadcastMessage(Essentials.getSettings().getAnnounceNewPlayerFormat(user)); + if (Essentials.getStatic().getSettings().getAnnounceNewPlayers()) + { + Essentials.getStatic().getServer().broadcastMessage(Essentials.getStatic().getSettings().getAnnounceNewPlayerFormat(user)); + } } } |