TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

Move the per world permissions:

Browse source 
essentials.world.worldname is moved to essentials.worlds.worldname
This commit is contained in:
KHobbits 2012-09-08 22:50:20 +01:00
parent 78a580bc40
commit f9659dae68
13 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/commands/Commandback.java
View file

@ -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 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() 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); final Trade charge = new Trade(this.getName(), ess);
charge.isAffordableFor(user); charge.isAffordableFor(user);

4
Essentials/src/com/earth2me/essentials/commands/Commandhome.java
View file

@ -102,9 +102,9 @@ public class Commandhome extends EssentialsCommand
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
if (user.getWorld() != loc.getWorld() && ess.getSettings().isWorldHomePermissions() 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); user.getTeleport().home(loc, charge);
} }

8
Essentials/src/com/earth2me/essentials/commands/Commandtp.java
View file

@ -31,9 +31,9 @@ public class Commandtp extends EssentialsCommand
throw new Exception(_("teleportDisabled", player.getDisplayName())); throw new Exception(_("teleportDisabled", player.getDisplayName()));
} }
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() 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.sendMessage(_("teleporting"));
final Trade charge = new Trade(this.getName(), ess); final Trade charge = new Trade(this.getName(), ess);
@ -58,9 +58,9 @@ public class Commandtp extends EssentialsCommand
throw new Exception(_("teleportDisabled", toPlayer.getDisplayName())); throw new Exception(_("teleportDisabled", toPlayer.getDisplayName()));
} }
if (target.getWorld() != toPlayer.getWorld() && ess.getSettings().isWorldTeleportPermissions() 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.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);
target.sendMessage(_("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName())); target.sendMessage(_("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName()));

4
Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
View file

@ -26,9 +26,9 @@ public class Commandtpa extends EssentialsCommand
throw new Exception(_("teleportDisabled", player.getDisplayName())); throw new Exception(_("teleportDisabled", player.getDisplayName()));
} }
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() 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)) if (!player.isIgnoredPlayer(user))
{ {

2
Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java
View file

@ -46,7 +46,7 @@ public class Commandtpaall extends EssentialsCommand
continue; continue;
} }
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !user.isAuthorized("essentials.world." + user.getWorld().getName())) && !user.isAuthorized("essentials.worlds." + user.getWorld().getName()))
{ {
continue; continue;
} }

4
Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
View file

@ -27,14 +27,14 @@ public class Commandtpaccept extends EssentialsCommand
if (user.isTpRequestHere() && ((!target.isAuthorized("essentials.tpahere") && !target.isAuthorized("essentials.tpaall")) if (user.isTpRequestHere() && ((!target.isAuthorized("essentials.tpahere") && !target.isAuthorized("essentials.tpaall"))
|| (user.getWorld() != target.getWorld() && ess.getSettings().isWorldTeleportPermissions() || (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")); throw new Exception(_("noPendingRequest"));
} }
if (!user.isTpRequestHere() && (!target.isAuthorized("essentials.tpa") if (!user.isTpRequestHere() && (!target.isAuthorized("essentials.tpa")
|| (user.getWorld() != target.getWorld() && ess.getSettings().isWorldTeleportPermissions() || (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")); throw new Exception(_("noPendingRequest"));
} }

4
Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
View file

@ -26,9 +26,9 @@ public class Commandtpahere extends EssentialsCommand
throw new Exception(_("teleportDisabled", player.getDisplayName())); throw new Exception(_("teleportDisabled", player.getDisplayName()));
} }
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() 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.requestTeleport(user, true);
player.sendMessage(_("teleportHereRequest", user.getDisplayName())); player.sendMessage(_("teleportHereRequest", user.getDisplayName()));

2
Essentials/src/com/earth2me/essentials/commands/Commandtpall.java
View file

@ -43,7 +43,7 @@ public class Commandtpall extends EssentialsCommand
continue; continue;
} }
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !user.isAuthorized("essentials.world." + user.getWorld().getName())) && !user.isAuthorized("essentials.worlds." + user.getWorld().getName()))
{ {
continue; continue;
} }

4
Essentials/src/com/earth2me/essentials/commands/Commandtphere.java
View file

@ -23,9 +23,9 @@ public class Commandtphere extends EssentialsCommand
throw new Exception(_("teleportDisabled", player.getDisplayName())); throw new Exception(_("teleportDisabled", player.getDisplayName()));
} }
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() 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); player.getTeleport().teleport(user, new Trade(this.getName(), ess), TeleportCause.COMMAND);
user.sendMessage(_("teleporting")); user.sendMessage(_("teleporting"));

8
Essentials/src/com/earth2me/essentials/commands/Commandtpo.java
View file

@ -28,9 +28,9 @@ public class Commandtpo extends EssentialsCommand
throw new NoSuchFieldException(_("playerNotFound")); throw new NoSuchFieldException(_("playerNotFound"));
} }
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() 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.sendMessage(_("teleporting"));
user.getTeleport().now(player, false, TeleportCause.COMMAND); user.getTeleport().now(player, false, TeleportCause.COMMAND);
@ -52,9 +52,9 @@ public class Commandtpo extends EssentialsCommand
} }
if (target.getWorld() != toPlayer.getWorld() && ess.getSettings().isWorldTeleportPermissions() 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.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);

4
Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java
View file

@ -31,9 +31,9 @@ public class Commandtpohere extends EssentialsCommand
} }
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() 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 // Verify permission

4
Essentials/src/com/earth2me/essentials/commands/Commandworld.java
View file

@ -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; double factor;

4
Essentials/src/config.yml
View file

@ -298,7 +298,7 @@ no-god-in-worlds:
# Set to true to enable per-world permissions for teleporting between worlds with essentials commands # 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. # 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. # This does not effect the /home command, there is a seperate toggle below for this.
world-teleport-permissions: false 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 # Set to true to enable per-world permissions for using homes to teleport between worlds
# This applies to the /home only. # 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 world-home-permissions: false
# Allow players to have multiple homes. # Allow players to have multiple homes.