diff options
-rw-r--r-- | Essentials/src/net/ess3/Essentials.java | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IEssentials.java | 16 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandsetspawn.java | 3 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandspawn.java | 4 |
4 files changed, 14 insertions, 17 deletions
diff --git a/Essentials/src/net/ess3/Essentials.java b/Essentials/src/net/ess3/Essentials.java index 6a135604c..00499a574 100644 --- a/Essentials/src/net/ess3/Essentials.java +++ b/Essentials/src/net/ess3/Essentials.java @@ -296,9 +296,6 @@ public class Essentials implements IEssentials return getServer().getOnlinePlayers().length; } - /* - * @Override public PermissionsHandler getPermissionsHandler() { return permissionsHandler; } - */ @Override public IItemDb getItemDb() { @@ -340,6 +337,11 @@ public class Essentials implements IEssentials { return economy; } + + public SpawnsHolder getSpawns() + { + return spawns; + } @Override public void reload() diff --git a/Essentials/src/net/ess3/api/IEssentials.java b/Essentials/src/net/ess3/api/IEssentials.java index f84633530..0833b3d2b 100644 --- a/Essentials/src/net/ess3/api/IEssentials.java +++ b/Essentials/src/net/ess3/api/IEssentials.java @@ -5,6 +5,7 @@ import java.util.logging.Logger; import net.ess3.EssentialsTimer; import net.ess3.economy.register.Methods; import net.ess3.metrics.Metrics; +import net.ess3.settings.SpawnsHolder; import org.bukkit.Server; import org.bukkit.World; @@ -41,11 +42,6 @@ public interface IEssentials extends IComponent Methods getPaymentMethod(); - //int scheduleAsyncDelayedTask(Runnable run); - //int scheduleSyncDelayedTask(Runnable run); - //int scheduleSyncDelayedTask(Runnable run, long delay); - //int scheduleSyncRepeatingTask(Runnable run, long delay, long period); - //IPermissionsHandler getPermissionsHandler(); void reload(); void setRanks(IRanks groups); @@ -59,12 +55,14 @@ public interface IEssentials extends IComponent Logger getLogger(); IPlugin getPlugin(); - + List<String> getVanishedPlayers(); - + EssentialsTimer getTimer(); - + Metrics getMetrics(); - + void setMetrics(Metrics metrics); + + SpawnsHolder getSpawns(); } diff --git a/Essentials/src/net/ess3/commands/Commandsetspawn.java b/Essentials/src/net/ess3/commands/Commandsetspawn.java index 45b942943..674e5c247 100644 --- a/Essentials/src/net/ess3/commands/Commandsetspawn.java +++ b/Essentials/src/net/ess3/commands/Commandsetspawn.java @@ -2,7 +2,6 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.settings.SpawnsHolder; public class Commandsetspawn extends EssentialsCommand @@ -11,7 +10,7 @@ public class Commandsetspawn extends EssentialsCommand public void run(final IUser user, final String commandLabel, final String[] args) throws Exception { final String group = args.length > 0 ? getFinalArg(args, 0) : "default"; - ((SpawnsHolder)module).setSpawn(user.getPlayer().getLocation(), group); + ess.getSpawns().setSpawn(user.getPlayer().getLocation(), group); user.sendMessage(_("spawnSet", group)); } } diff --git a/Essentials/src/net/ess3/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java index 23b2bf5ef..9a0625a6c 100644 --- a/Essentials/src/net/ess3/commands/Commandspawn.java +++ b/Essentials/src/net/ess3/commands/Commandspawn.java @@ -4,7 +4,6 @@ import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; -import net.ess3.settings.SpawnsHolder; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -48,8 +47,7 @@ public class Commandspawn extends EssentialsCommand private void respawn(final IUser user, final Trade charge) throws Exception { - final SpawnsHolder spawns = (SpawnsHolder)this.module; - final Location spawn = spawns.getSpawn(ess.getRanks().getMainGroup(user)); + final Location spawn = ess.getSpawns().getSpawn(ess.getRanks().getMainGroup(user)); user.getTeleport().teleport(spawn, charge, TeleportCause.COMMAND); } } |