Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-23 01:27:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix for Craftbukkit Bug 912

Browse Source
This commit is contained in:
snowleo 2011-06-12 02:47:50 +02:00
parent 26c9b34744
commit edefb21142
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
View File

@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerRespawnEvent;
public class EssentialsSpawnPlayerListener extends PlayerListener public class EssentialsSpawnPlayerListener extends PlayerListener
{ {
@Override @Override
public void onPlayerRespawn(PlayerRespawnEvent event) public void onPlayerRespawn(final PlayerRespawnEvent event)
{ {
final IEssentials ess = Essentials.getStatic(); final IEssentials ess = Essentials.getStatic();
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
@ -25,7 +25,8 @@ public class EssentialsSpawnPlayerListener extends PlayerListener
if (ess.getSettings().getRespawnAtHome()) if (ess.getSettings().getRespawnAtHome())
{ {
Location home = user.getHome(user.getLocation()); Location home = user.getHome(user.getLocation());
if (home == null) { if (home == null)
{
throw new Exception(); throw new Exception();
} }
event.setRespawnLocation(home); event.setRespawnLocation(home);
@ -36,28 +37,38 @@ public class EssentialsSpawnPlayerListener extends PlayerListener
{ {
} }
Location spawn = ess.getSpawn().getSpawn(user.getGroup()); Location spawn = ess.getSpawn().getSpawn(user.getGroup());
if (spawn == null) { if (spawn == null)
{
return; return;
} }
event.setRespawnLocation(spawn); event.setRespawnLocation(spawn);
} }
@Override @Override
public void onPlayerJoin(PlayerJoinEvent event) public void onPlayerJoin(final PlayerJoinEvent event)
{ {
final IEssentials ess = Essentials.getStatic(); final IEssentials ess = Essentials.getStatic();
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
if (!user.isNew()) if (!user.isNew())
{ {
return; return;
} }
user.setNew(false); user.setNew(false);
try { ess.scheduleSyncDelayedTask(new Runnable()
user.getTeleport().now(ess.getSpawn().getSpawn(ess.getSettings().getNewbieSpawn())); {
} catch (Exception ex) { public void run()
Logger.getLogger("Minecraft").log(Level.WARNING, Util.i18n("teleportNewPlayerError"), ex); {
} try
{
user.getTeleport().now(ess.getSpawn().getSpawn(ess.getSettings().getNewbieSpawn()));
}
catch (Exception ex)
{
Logger.getLogger("Minecraft").log(Level.WARNING, Util.i18n("teleportNewPlayerError"), ex);
}
}
});
if (ess.getSettings().getAnnounceNewPlayers()) if (ess.getSettings().getAnnounceNewPlayers())
{ {