Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add yaw and rotation to default TeleportCommand. Fixes BUKKIT-2774

Browse Source
This commit is contained in:
EvilSeph 2012-10-31 21:26:43 -04:00
parent 127884e290
commit 44be0455cd
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/bukkit/command/defaults/TeleportCommand.java
View File

@ -55,20 +55,24 @@ public class TeleportCommand extends VanillaCommand {
return true; return true;
} }
player.teleport(target, TeleportCause.COMMAND); player.teleport(target, TeleportCause.COMMAND);
Command.broadcastCommandMessage(sender, "Teleported " + player.getName() + " to " + target.getName()); Command.broadcastCommandMessage(sender, "Teleported " + player.getDisplayName() + " to " + target.getDisplayName());
} else if (player.getWorld() != null) { } else if (player.getWorld() != null) {
double x = getCoordinate(sender, player.getLocation().getX(), args[args.length - 3]); Location playerLocation = player.getLocation();
double y = getCoordinate(sender,player.getLocation().getY(), args[args.length - 2], 0, 0); double x = getCoordinate(sender, playerLocation.getX(), args[args.length - 3]);
double z = getCoordinate(sender, player.getLocation().getZ(), args[args.length - 1]); double y = getCoordinate(sender, playerLocation.getY(), args[args.length - 2], 0, 0);
double z = getCoordinate(sender, playerLocation.getZ(), args[args.length - 1]);
if (x == MIN_COORD_MINUS_ONE || y == MIN_COORD_MINUS_ONE || z == MIN_COORD_MINUS_ONE) { if (x == MIN_COORD_MINUS_ONE || y == MIN_COORD_MINUS_ONE || z == MIN_COORD_MINUS_ONE) {
sender.sendMessage("Please provide a valid location!"); sender.sendMessage("Please provide a valid location!");
return true; return true;
} }
Location location = new Location(player.getWorld(), x, y, z); playerLocation.setX(x);
player.teleport(location); playerLocation.setY(y);
Command.broadcastCommandMessage(sender, "Teleported " + player.getName() + " to " + + x + "," + y + "," + z); playerLocation.setZ(z);
player.teleport(playerLocation);
Command.broadcastCommandMessage(sender, String.format("Teleported %s to %.2f, %.2f, %.2f", player.getDisplayName(), x, y, z));
} }
return true; return true;
} }