diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java index da61073ce..bffbd591d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java @@ -57,15 +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 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()); - if (args.length == 4) { - loc.setWorld(ess.getWorld(args[3])); + if (args.length == 5) { + loc.setWorld(ess.getWorld(args[4])); } - if (args.length > 4) { + if (args.length > 5) { loc.setYaw((FloatUtil.parseFloat(args[4]) + 180 + 360) % 360); loc.setPitch(FloatUtil.parseFloat(args[5])); } - if (args.length > 5) { - loc.setWorld(ess.getWorld(args[5])); + if (args.length > 6) { + loc.setWorld(ess.getWorld(args[6])); } if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) { throw new NotEnoughArgumentsException(tl("teleportInvalidLocation"));