minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 01:54:25 +02:00
Code Issues Releases Wiki Activity

Fix Spawns commands

Browse Source
This commit is contained in:
snowleo
2012-10-03 13:54:35 +02:00
parent cef10a5755
commit 53b512415e
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Essentials/src/net/ess3/Essentials.java
View File

@@ -296,9 +296,6 @@ public class Essentials implements IEssentials
return getServer().getOnlinePlayers().length; return getServer().getOnlinePlayers().length;
} }
/*
* @Override public PermissionsHandler getPermissionsHandler() { return permissionsHandler; }
*/
@Override @Override
public IItemDb getItemDb() public IItemDb getItemDb()
{ {
@@ -341,6 +338,11 @@ public class Essentials implements IEssentials
return economy; return economy;
} }
public SpawnsHolder getSpawns()
{
return spawns;
}
@Override @Override
public void reload() public void reload()
{ {

8
Essentials/src/net/ess3/api/IEssentials.java
View File

@@ -5,6 +5,7 @@ import java.util.logging.Logger;
import net.ess3.EssentialsTimer; import net.ess3.EssentialsTimer;
import net.ess3.economy.register.Methods; import net.ess3.economy.register.Methods;
import net.ess3.metrics.Metrics; import net.ess3.metrics.Metrics;
import net.ess3.settings.SpawnsHolder;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
@@ -41,11 +42,6 @@ public interface IEssentials extends IComponent
Methods getPaymentMethod(); 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 reload();
void setRanks(IRanks groups); void setRanks(IRanks groups);
@@ -67,4 +63,6 @@ public interface IEssentials extends IComponent
Metrics getMetrics(); Metrics getMetrics();
void setMetrics(Metrics metrics); void setMetrics(Metrics metrics);
SpawnsHolder getSpawns();
} }

3
Essentials/src/net/ess3/commands/Commandsetspawn.java
View File

@@ -2,7 +2,6 @@ package net.ess3.commands;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.settings.SpawnsHolder;
public class Commandsetspawn extends EssentialsCommand 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 public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
{ {
final String group = args.length > 0 ? getFinalArg(args, 0) : "default"; 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)); user.sendMessage(_("spawnSet", group));
} }
} }

4
Essentials/src/net/ess3/commands/Commandspawn.java
View File

@@ -4,7 +4,6 @@ import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.economy.Trade; import net.ess3.economy.Trade;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import net.ess3.settings.SpawnsHolder;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; 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 private void respawn(final IUser user, final Trade charge) throws Exception
{ {
final SpawnsHolder spawns = (SpawnsHolder)this.module; final Location spawn = ess.getSpawns().getSpawn(ess.getRanks().getMainGroup(user));
final Location spawn = spawns.getSpawn(ess.getRanks().getMainGroup(user));
user.getTeleport().teleport(spawn, charge, TeleportCause.COMMAND); user.getTeleport().teleport(spawn, charge, TeleportCause.COMMAND);
} }
} }