diff options
13 files changed, 28 insertions, 28 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandback.java b/Essentials/src/com/earth2me/essentials/commands/Commandback.java index d2ed98e69..6943ab802 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandback.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandback.java @@ -17,9 +17,9 @@ public class Commandback extends EssentialsCommand protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { if (user.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + user.getLastLocation().getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + user.getLastLocation().getWorld().getName())) { - throw new Exception(_("noPerm", "essentials.world." + user.getLastLocation().getWorld().getName())); + throw new Exception(_("noPerm", "essentials.worlds." + user.getLastLocation().getWorld().getName())); } final Trade charge = new Trade(this.getName(), ess); charge.isAffordableFor(user); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java index 2c91a06c9..546bfc85d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java @@ -102,9 +102,9 @@ public class Commandhome extends EssentialsCommand throw new NotEnoughArgumentsException(); } if (user.getWorld() != loc.getWorld() && ess.getSettings().isWorldHomePermissions() - && !user.isAuthorized("essentials.world." + loc.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + loc.getWorld().getName())) { - throw new Exception(_("noPerm", "essentials.world." + loc.getWorld().getName())); + throw new Exception(_("noPerm", "essentials.worlds." + loc.getWorld().getName())); } user.getTeleport().home(loc, charge); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java index d6d6b76f9..7c6cbe82d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java @@ -31,9 +31,9 @@ public class Commandtp extends EssentialsCommand throw new Exception(_("teleportDisabled", player.getDisplayName())); } if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + player.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) { - throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName())); + throw new Exception(_("noPerm", "essentials.worlds." + player.getWorld().getName())); } user.sendMessage(_("teleporting")); final Trade charge = new Trade(this.getName(), ess); @@ -58,9 +58,9 @@ public class Commandtp extends EssentialsCommand throw new Exception(_("teleportDisabled", toPlayer.getDisplayName())); } if (target.getWorld() != toPlayer.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + toPlayer.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + toPlayer.getWorld().getName())) { - throw new Exception(_("noPerm", "essentials.world." + toPlayer.getWorld().getName())); + throw new Exception(_("noPerm", "essentials.worlds." + toPlayer.getWorld().getName())); } target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND); target.sendMessage(_("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName())); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java index d94f0aca5..660389694 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java @@ -26,9 +26,9 @@ public class Commandtpa extends EssentialsCommand throw new Exception(_("teleportDisabled", player.getDisplayName())); } if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + player.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) { - throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName())); + throw new Exception(_("noPerm", "essentials.worlds." + player.getWorld().getName())); } if (!player.isIgnoredPlayer(user)) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java index 7af445c51..8f77441ec 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java @@ -46,7 +46,7 @@ public class Commandtpaall extends EssentialsCommand continue; } if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + user.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())) { continue; } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java index 9203f9015..86f88f884 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java @@ -27,14 +27,14 @@ public class Commandtpaccept extends EssentialsCommand if (user.isTpRequestHere() && ((!target.isAuthorized("essentials.tpahere") && !target.isAuthorized("essentials.tpaall")) || (user.getWorld() != target.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + user.getWorld().getName())))) + && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())))) { throw new Exception(_("noPendingRequest")); } if (!user.isTpRequestHere() && (!target.isAuthorized("essentials.tpa") || (user.getWorld() != target.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + target.getWorld().getName())))) + && !user.isAuthorized("essentials.worlds." + target.getWorld().getName())))) { throw new Exception(_("noPendingRequest")); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java index 9d389ecac..b6ea96b26 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java @@ -26,9 +26,9 @@ public class Commandtpahere extends EssentialsCommand throw new Exception(_("teleportDisabled", player.getDisplayName())); } if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + user.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())) { - throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName())); + throw new Exception(_("noPerm", "essentials.worlds." + user.getWorld().getName())); } player.requestTeleport(user, true); player.sendMessage(_("teleportHereRequest", user.getDisplayName())); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java index 6335a4a54..e94e91d42 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java @@ -43,7 +43,7 @@ public class Commandtpall extends EssentialsCommand continue; } if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + user.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())) { continue; } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java index 92eb87226..641290575 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java @@ -23,9 +23,9 @@ public class Commandtphere extends EssentialsCommand throw new Exception(_("teleportDisabled", player.getDisplayName())); } if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + user.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())) { - throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName())); + throw new Exception(_("noPerm", "essentials.worlds." + user.getWorld().getName())); } player.getTeleport().teleport(user, new Trade(this.getName(), ess), TeleportCause.COMMAND); user.sendMessage(_("teleporting")); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java index 4d7ced478..504730306 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java @@ -28,9 +28,9 @@ public class Commandtpo extends EssentialsCommand throw new NoSuchFieldException(_("playerNotFound")); } if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + player.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) { - throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName())); + throw new Exception(_("noPerm", "essentials.worlds." + player.getWorld().getName())); } user.sendMessage(_("teleporting")); user.getTeleport().now(player, false, TeleportCause.COMMAND); @@ -52,9 +52,9 @@ public class Commandtpo extends EssentialsCommand } if (target.getWorld() != toPlayer.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + toPlayer.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + toPlayer.getWorld().getName())) { - throw new Exception(_("noPerm", "essentials.world." + toPlayer.getWorld().getName())); + throw new Exception(_("noPerm", "essentials.worlds." + toPlayer.getWorld().getName())); } target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java index 880c4e362..23db7dd39 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java @@ -31,9 +31,9 @@ public class Commandtpohere extends EssentialsCommand } if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() - && !user.isAuthorized("essentials.world." + user.getWorld().getName())) + && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())) { - throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName())); + throw new Exception(_("noPerm", "essentials.worlds." + user.getWorld().getName())); } // Verify permission diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java index 647115d66..b0559a4a0 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java @@ -54,9 +54,9 @@ public class Commandworld extends EssentialsCommand } } - if (ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.world." + world.getName())) + if (ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + world.getName())) { - throw new Exception(_("noPerm", "essentials.world." + world.getName())); + throw new Exception(_("noPerm", "essentials.worlds." + world.getName())); } double factor; diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 7ee46f569..9e693b754 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -298,7 +298,7 @@ no-god-in-worlds: # Set to true to enable per-world permissions for teleporting between worlds with essentials commands # This applies to /world, /back, /tp[a|o][here|all], but not warps. -# Give someone permission to teleport to a world with essentials.world.<worldname> +# Give someone permission to teleport to a world with essentials.worlds.<worldname> # This does not effect the /home command, there is a seperate toggle below for this. world-teleport-permissions: false @@ -338,7 +338,7 @@ update-bed-at-daytime: true # Set to true to enable per-world permissions for using homes to teleport between worlds # This applies to the /home only. -# Give someone permission to teleport to a world with essentials.world.<worldname> +# Give someone permission to teleport to a world with essentials.worlds.<worldname> world-home-permissions: false # Allow players to have multiple homes. |