Added /spawn <player>

Test #607

1 files changed, 31 insertions, 2 deletions

diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
index f9ea9fa36..e38de76cc 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
@@ -3,7 +3,10 @@ package com.earth2me.essentials.spawn;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.commands.EssentialsCommand;
+import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import static com.earth2me.essentials.I18n._;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandspawn extends EssentialsCommand
@@ -14,10 +17,36 @@ public class Commandspawn extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	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);
 		charge.isAffordableFor(user);
-		user.getTeleport().respawn(ess.getSpawn(), charge);
+		if (args.length > 0 && user.isAuthorized("essentials.spawn.other"))
+		{
+			User otherUser = getPlayer(server, args, 0);
+			otherUser.getTeleport().respawn(ess.getSpawn(), charge);
+			if (otherUser != user)
+			{
+				otherUser.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
+				user.sendMessage(_("teleporting"));
+			}
+		}
+		else
+		{
+			user.getTeleport().respawn(ess.getSpawn(), charge);
+		}
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		User user = getPlayer(server, args, 0);
+		user.getTeleport().respawn(ess.getSpawn(), null);
+		user.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
+		sender.sendMessage(_("teleporting"));
 	}
 }