1 files changed, 15 insertions, 19 deletions

diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
index 6335d6c69..b817c854a 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
@@ -2,30 +2,25 @@ package com.earth2me.essentials.spawn;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.commands.EssentialsCommand;
 import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import com.earth2me.essentials.perm.Permissions;
 import org.bukkit.Location;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandspawn extends EssentialsCommand
 {
-	public Commandspawn()
-	{
-		super("spawn");
-	}
-
 	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{	
-		final Trade charge = new Trade(this.getName(), ess);
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	{
+		final Trade charge = new Trade(commandName, ess);
 		charge.isAffordableFor(user);
-		if (args.length > 0 && user.isAuthorized("essentials.spawn.others"))
+		if (args.length > 0 && Permissions.SPAWN_OTHERS.isAuthorized(user))
 		{
-			final User otherUser = getPlayer(server, args, 0);
+			final IUser otherUser = getPlayer(args, 0);
 			respawn(otherUser, null);
 			if (!otherUser.equals(user))
 			{
@@ -34,27 +29,28 @@ public class Commandspawn extends EssentialsCommand
 			}
 		}
 		else
-		{	
+		{
 			respawn(user, null);
 		}
 	}
 
 	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final User user = getPlayer(server, args, 0);
+		final IUser user = getPlayer(args, 0);
 		respawn(user, null);
 		user.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
 		sender.sendMessage(_("teleporting"));
 	}
-	
-	private void respawn (final User user, final Trade charge) throws Exception {
+
+	private void respawn(final IUser user, final Trade charge) throws Exception
+	{
 		final SpawnStorage spawns = (SpawnStorage)this.module;
-		final Location spawn = spawns.getSpawn(user.getGroup());
-		user.getTeleport().teleport(spawn, charge, TeleportCause.COMMAND);	
+		final Location spawn = spawns.getSpawn(ess.getGroups().getMainGroup(user));
+		user.getTeleport().teleport(spawn, charge, TeleportCause.COMMAND);
 	}
 }