diff options
Diffstat (limited to 'EssentialsSpawn')
4 files changed, 26 insertions, 15 deletions
diff --git a/EssentialsSpawn/nbproject/project.properties b/EssentialsSpawn/nbproject/project.properties index 3b7354449..524c40357 100644 --- a/EssentialsSpawn/nbproject/project.properties +++ b/EssentialsSpawn/nbproject/project.properties @@ -26,12 +26,12 @@ dist.jar=${dist.dir}/EssentialsSpawn.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar +file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar includes=** jar.compress=false javac.classpath=\ ${reference.Essentials.jar}:\ - ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar} + ${file.reference.bukkit-0.0.1-SNAPSHOT.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -58,6 +58,7 @@ javadoc.use=true javadoc.version=false javadoc.windowtitle= meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false platform.active=default_platform project.Essentials=../Essentials reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java index 88a7c477b..5660c3778 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.spawn; -import com.earth2me.essentials.Charge; +import com.earth2me.essentials.Trade; import org.bukkit.Server; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.IEssentials; @@ -19,7 +19,7 @@ public class Commandspawn extends EssentialsCommand public void run(Server server, User user, String commandLabel, String[] args) throws Exception { final IEssentials ess = Essentials.getStatic(); - final Charge charge = new Charge(this.getName(), ess); + final Trade charge = new Trade(this.getName(), ess); charge.isAffordableFor(user); user.getTeleport().respawn(ess.getSpawn(), charge); } diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java index d6b638d03..fb2e712b7 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java @@ -6,7 +6,6 @@ import com.earth2me.essentials.*; import org.bukkit.command.*; import org.bukkit.event.Event.Priority; import org.bukkit.event.Event.Type; -import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.*; diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index e1e804e58..96915bd89 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerRespawnEvent; public class EssentialsSpawnPlayerListener extends PlayerListener { @Override - public void onPlayerRespawn(PlayerRespawnEvent event) + public void onPlayerRespawn(final PlayerRespawnEvent event) { final IEssentials ess = Essentials.getStatic(); final User user = ess.getUser(event.getPlayer()); @@ -25,7 +25,8 @@ public class EssentialsSpawnPlayerListener extends PlayerListener if (ess.getSettings().getRespawnAtHome()) { Location home = user.getHome(user.getLocation()); - if (home == null) { + if (home == null) + { throw new Exception(); } event.setRespawnLocation(home); @@ -36,28 +37,38 @@ public class EssentialsSpawnPlayerListener extends PlayerListener { } Location spawn = ess.getSpawn().getSpawn(user.getGroup()); - if (spawn == null) { + if (spawn == null) + { return; } event.setRespawnLocation(spawn); } @Override - public void onPlayerJoin(PlayerJoinEvent event) + public void onPlayerJoin(final PlayerJoinEvent event) { final IEssentials ess = Essentials.getStatic(); final User user = ess.getUser(event.getPlayer()); - + if (!user.isNew()) { return; } user.setNew(false); - 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 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); + } + } + }); if (ess.getSettings().getAnnounceNewPlayers()) { |