Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-28 12:07:38 +01:00
Code Issues Projects Releases Wiki Activity

Align /tp syntax with Minecraft /tp command

Browse Source
This commit is contained in:
snowleo 2012-12-15 14:12:34 +01:00
parent 5741cea3f5
commit e706614a3b
2 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Essentials/src/com/earth2me/essentials/commands/Commandtp.java
View File

@ -4,6 +4,7 @@ import com.earth2me.essentials.Console;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import org.bukkit.Location;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@ -40,7 +41,28 @@ public class Commandtp extends EssentialsCommand
charge.isAffordableFor(user); charge.isAffordableFor(user);
user.getTeleport().teleport(player, charge, TeleportCause.COMMAND); user.getTeleport().teleport(player, charge, TeleportCause.COMMAND);
throw new NoChargeException(); throw new NoChargeException();
case 4:
if (!user.isAuthorized("essentials.tp.others"))
{
throw new Exception(_("noPerm", "essentials.tp.others"));
}
user.sendMessage(_("teleporting"));
final User target2 = getPlayer(server, args, 0);
final double x = args[1].startsWith("~") ? target2.getLocation().getX() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
final double y = args[2].startsWith("~") ? target2.getLocation().getY() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
final double z = args[3].startsWith("~") ? target2.getLocation().getZ() + Integer.parseInt(args[3].substring(1)) : Integer.parseInt(args[3]);
if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000)
{
throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //todo: I18n
}
final Location location = new Location(target2.getWorld(), x, y, z);
if (!target2.isTeleportEnabled())
{
throw new Exception(_("teleportDisabled", target2.getDisplayName()));
}
target2.getTeleport().now(location, false, TeleportCause.COMMAND);
target2.sendMessage(_("teleporting"));
case 2:
default: default:
if (!user.isAuthorized("essentials.tp.others")) if (!user.isAuthorized("essentials.tp.others"))
{ {
@ -78,8 +100,24 @@ public class Commandtp extends EssentialsCommand
sender.sendMessage(_("teleporting")); sender.sendMessage(_("teleporting"));
final User target = getPlayer(server, args, 0); final User target = getPlayer(server, args, 0);
if (args.length == 2)
{
final User toPlayer = getPlayer(server, args, 1); final User toPlayer = getPlayer(server, args, 1);
target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND); target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);
target.sendMessage(_("teleportAtoB", Console.NAME, toPlayer.getDisplayName())); target.sendMessage(_("teleportAtoB", Console.NAME, toPlayer.getDisplayName()));
} }
else if (args.length > 3)
{
final double x = args[1].startsWith("~") ? target.getLocation().getX() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
final double y = args[2].startsWith("~") ? target.getLocation().getY() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
final double z = args[3].startsWith("~") ? target.getLocation().getZ() + Integer.parseInt(args[3].substring(1)) : Integer.parseInt(args[3]);
if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000)
{
throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //todo: I18n
}
final Location location = new Location(target.getWorld(), x, y, z);
target.getTeleport().now(location, false, TeleportCause.COMMAND);
target.sendMessage(_("teleporting"));
}
}
} }

12
Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
View File

@ -24,9 +24,9 @@ public class Commandtppos extends EssentialsCommand
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
final int x = Integer.parseInt(args[0]); final double x = args[0].startsWith("~") ? user.getLocation().getX() + Integer.parseInt(args[0].substring(1)) : Integer.parseInt(args[0]);
final int y = Integer.parseInt(args[1]); final double y = args[1].startsWith("~") ? user.getLocation().getY() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
final int z = Integer.parseInt(args[2]); final double z = args[2].startsWith("~") ? user.getLocation().getZ() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
final Location location = new Location(user.getWorld(), x, y, z); final Location location = new Location(user.getWorld(), x, y, z);
if (args.length > 3) if (args.length > 3)
{ {
@ -56,9 +56,9 @@ public class Commandtppos extends EssentialsCommand
} }
User user = ess.getUser(server.getPlayer(args[0])); User user = ess.getUser(server.getPlayer(args[0]));
final int x = Integer.parseInt(args[1]); final double x = args[1].startsWith("~") ? user.getLocation().getX() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
final int y = Integer.parseInt(args[2]); final double y = args[2].startsWith("~") ? user.getLocation().getY() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
final int z = Integer.parseInt(args[3]); final double z = args[3].startsWith("~") ? user.getLocation().getZ() + Integer.parseInt(args[3].substring(1)) : Integer.parseInt(args[3]);
final Location location = new Location(user.getWorld(), x, y, z); final Location location = new Location(user.getWorld(), x, y, z);
if (args.length > 4) if (args.length > 4)
{ {