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

[Feature]: Add world argument to /tppos

Browse Source
This commit is contained in:
CoolV1994 2015-07-16 19:09:19 -04:00
parent f43501e828
commit 3283b8c0a3
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,12 +26,16 @@ public class Commandtppos extends EssentialsCommand {
final double y = args[1].startsWith("~") ? user.getLocation().getY() + (args[1].length() > 1 ? Integer.parseInt(args[1].substring(1)) : 0) : Integer.parseInt(args[1]); final double y = args[1].startsWith("~") ? user.getLocation().getY() + (args[1].length() > 1 ? Integer.parseInt(args[1].substring(1)) : 0) : Integer.parseInt(args[1]);
final double z = args[2].startsWith("~") ? user.getLocation().getZ() + (args[2].length() > 1 ? Integer.parseInt(args[2].substring(1)) : 0) : Integer.parseInt(args[2]); final double z = args[2].startsWith("~") ? user.getLocation().getZ() + (args[2].length() > 1 ? Integer.parseInt(args[2].substring(1)) : 0) : Integer.parseInt(args[2]);
final Location loc = new Location(user.getWorld(), x, y, z, user.getLocation().getYaw(), user.getLocation().getPitch()); final Location loc = new Location(user.getWorld(), x, y, z, user.getLocation().getYaw(), user.getLocation().getPitch());
if (args.length > 3) { if (args.length == 4) {
loc.setYaw((FloatUtil.parseFloat(args[3]) + 180 + 360) % 360); loc.setWorld(ess.getWorld(args[3]));
} }
if (args.length > 4) { if (args.length > 4) {
loc.setYaw((FloatUtil.parseFloat(args[3]) + 180 + 360) % 360);
loc.setPitch(FloatUtil.parseFloat(args[4])); loc.setPitch(FloatUtil.parseFloat(args[4]));
} }
if (args.length > 5) {
loc.setWorld(ess.getWorld(args[5]));
}
if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) { if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) {
throw new NotEnoughArgumentsException(tl("teleportInvalidLocation")); throw new NotEnoughArgumentsException(tl("teleportInvalidLocation"));
} }
@ -53,11 +57,15 @@ public class Commandtppos extends EssentialsCommand {
final double y = args[2].startsWith("~") ? user.getLocation().getY() + (args[2].length() > 1 ? Integer.parseInt(args[2].substring(1)) : 0) : Integer.parseInt(args[2]); final double y = args[2].startsWith("~") ? user.getLocation().getY() + (args[2].length() > 1 ? Integer.parseInt(args[2].substring(1)) : 0) : Integer.parseInt(args[2]);
final double z = args[3].startsWith("~") ? user.getLocation().getZ() + (args[3].length() > 1 ? Integer.parseInt(args[3].substring(1)) : 0) : Integer.parseInt(args[3]); final double z = args[3].startsWith("~") ? user.getLocation().getZ() + (args[3].length() > 1 ? Integer.parseInt(args[3].substring(1)) : 0) : Integer.parseInt(args[3]);
final Location loc = new Location(user.getWorld(), x, y, z, user.getLocation().getYaw(), user.getLocation().getPitch()); final Location loc = new Location(user.getWorld(), x, y, z, user.getLocation().getYaw(), user.getLocation().getPitch());
if (args.length == 4) {
loc.setWorld(ess.getWorld(args[3]));
}
if (args.length > 4) { if (args.length > 4) {
loc.setYaw((FloatUtil.parseFloat(args[4]) + 180 + 360) % 360); loc.setYaw((FloatUtil.parseFloat(args[4]) + 180 + 360) % 360);
loc.setPitch(FloatUtil.parseFloat(args[5]));
} }
if (args.length > 5) { if (args.length > 5) {
loc.setPitch(FloatUtil.parseFloat(args[5])); loc.setWorld(ess.getWorld(args[5]));
} }
if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) { if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) {
throw new NotEnoughArgumentsException(tl("teleportInvalidLocation")); throw new NotEnoughArgumentsException(tl("teleportInvalidLocation"));