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

Merge pull request #1724 from Drkmaster83/2.x

Browse Source 
Implements PR#1516 - TPPos World-Teleport Permissions
This commit is contained in:
Trent Hensler 2017-12-25 18:24:01 -06:00 committed by GitHub
commit cd7e0963ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -32,14 +32,22 @@ public class Commandtppos extends EssentialsCommand {
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 == 4) { if (args.length == 4) {
loc.setWorld(ess.getWorld(args[3])); World w = ess.getWorld(args[3]);
if (user.getWorld() != w && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + w.getName())) {
throw new Exception(tl("noPerm", "essentials.worlds." + w.getName()));
}
loc.setWorld(w);
} }
if (args.length > 4) { if (args.length > 4) {
loc.setYaw((FloatUtil.parseFloat(args[3]) + 360) % 360); loc.setYaw((FloatUtil.parseFloat(args[3]) + 360) % 360);
loc.setPitch(FloatUtil.parseFloat(args[4])); loc.setPitch(FloatUtil.parseFloat(args[4]));
} }
if (args.length > 5) { if (args.length > 5) {
loc.setWorld(ess.getWorld(args[5])); World w = ess.getWorld(args[5]);
if (user.getWorld() != w && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + w.getName())) {
throw new Exception(tl("noPerm", "essentials.worlds." + w.getName()));
}
loc.setWorld(w);
} }
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"));
@ -116,4 +124,4 @@ public class Commandtppos extends EssentialsCommand {
return Collections.emptyList(); return Collections.emptyList();
} }
} }
} }