mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-04-25 16:09:44 +00:00
Add per world permission for setting world time.
Add two new locale messages: timeSetWorldPermission and timeSetAllPermission. Add two new permissions essentials.time.set.all and essentials.time.set.<world>.
This commit is contained in:
parent
38c8a8e666
commit
eb924b9861
2 changed files with 30 additions and 3 deletions
|
@ -113,12 +113,14 @@ public class Commandtime extends EssentialsCommand {
|
||||||
*/
|
*/
|
||||||
private Set<World> getWorlds(final Server server, final CommandSource sender, final String selector) throws Exception {
|
private Set<World> getWorlds(final Server server, final CommandSource sender, final String selector) throws Exception {
|
||||||
final Set<World> worlds = new TreeSet<>(new WorldNameComparator());
|
final Set<World> worlds = new TreeSet<>(new WorldNameComparator());
|
||||||
|
User user = ess.getUser(sender.getPlayer());
|
||||||
|
|
||||||
// If there is no selector we want the world the user is currently in. Or all worlds if it isn't a user.
|
// If there is no selector we want the world the user is currently in. Or all worlds if it isn't a user.
|
||||||
if (selector == null) {
|
if (selector == null) {
|
||||||
if (sender.isPlayer()) {
|
if (sender.isPlayer()) {
|
||||||
|
if (!user.isAuthorized("essentials.time.set." + normalizeWorldName(user.getWorld()))) {
|
||||||
final User user = ess.getUser(sender.getPlayer());
|
throw new Exception(tl("timeSetWorldPermission", user.getWorld().getName()));
|
||||||
|
}
|
||||||
worlds.add(user.getWorld());
|
worlds.add(user.getWorld());
|
||||||
} else {
|
} else {
|
||||||
worlds.addAll(server.getWorlds());
|
worlds.addAll(server.getWorlds());
|
||||||
|
@ -129,11 +131,30 @@ public class Commandtime extends EssentialsCommand {
|
||||||
// Try to find the world with name = selector
|
// Try to find the world with name = selector
|
||||||
final World world = server.getWorld(selector);
|
final World world = server.getWorld(selector);
|
||||||
if (world != null) {
|
if (world != null) {
|
||||||
|
if (user != null && !user.isAuthorized("essentials.time.set." + normalizeWorldName(world))) {
|
||||||
|
throw new Exception(tl("timeSetWorldPermission", world.getName()));
|
||||||
|
}
|
||||||
worlds.add(world);
|
worlds.add(world);
|
||||||
}
|
}
|
||||||
// If that fails, Is the argument something like "*" or "all"?
|
// If that fails, Is the argument something like "*" or "all"?
|
||||||
else if (selector.equalsIgnoreCase("*") || selector.equalsIgnoreCase("all")) {
|
else if (selector.equalsIgnoreCase("*") || selector.equalsIgnoreCase("all")) {
|
||||||
worlds.addAll(server.getWorlds());
|
// Add all worlds by default if the sender is console or player has the permission.
|
||||||
|
if (user == null || user.isAuthorized("essentials.time.set.all")) {
|
||||||
|
worlds.addAll(server.getWorlds());
|
||||||
|
} else {
|
||||||
|
// They don't have the _all_ permission, add worlds that they have permission for.
|
||||||
|
for (World world1 : server.getWorlds()) {
|
||||||
|
if (user.isAuthorized("essentials.time.set." + normalizeWorldName(world1))) {
|
||||||
|
worlds.add(world1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notify the player if they don't have permission for setting time on all worlds.
|
||||||
|
if (worlds.isEmpty()) {
|
||||||
|
throw new Exception(tl("timeSetAllPermission"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
// We failed to understand the world target...
|
// We failed to understand the world target...
|
||||||
else {
|
else {
|
||||||
|
@ -142,6 +163,10 @@ public class Commandtime extends EssentialsCommand {
|
||||||
|
|
||||||
return worlds;
|
return worlds;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String normalizeWorldName(World world) {
|
||||||
|
return world.getName().replaceAll("\\s+", "_");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -437,6 +437,8 @@ timeBeforeHeal=\u00a74Time before next heal\:\u00a7c {0}\u00a76.
|
||||||
timeBeforeTeleport=\u00a74Time before next teleport\:\u00a7c {0}\u00a76.
|
timeBeforeTeleport=\u00a74Time before next teleport\:\u00a7c {0}\u00a76.
|
||||||
timeFormat=\u00a7c{0}\u00a76 or \u00a7c{1}\u00a76 or \u00a7c{2}\u00a76
|
timeFormat=\u00a7c{0}\u00a76 or \u00a7c{1}\u00a76 or \u00a7c{2}\u00a76
|
||||||
timeSetPermission=\u00a74You are not authorized to set the time.
|
timeSetPermission=\u00a74You are not authorized to set the time.
|
||||||
|
timeSetAllPermission=\u00a74You are not authorized to set the time in all worlds.
|
||||||
|
timeSetWorldPermission=\u00a74You are not authorized to set the time in world ''{0}''.
|
||||||
timeWorldCurrent=\u00a76The current time in\u00a7c {0} \u00a76is \u00a7c{1}\u00a76.
|
timeWorldCurrent=\u00a76The current time in\u00a7c {0} \u00a76is \u00a7c{1}\u00a76.
|
||||||
timeWorldSet=\u00a76The time was set to\u00a7c {0} \u00a76in\: \u00a7c{1}\u00a76.
|
timeWorldSet=\u00a76The time was set to\u00a7c {0} \u00a76in\: \u00a7c{1}\u00a76.
|
||||||
totalWorthAll=\u00a7aSold all items and blocks for a total worth of \u00a7c{1}\u00a7a.
|
totalWorthAll=\u00a7aSold all items and blocks for a total worth of \u00a7c{1}\u00a7a.
|
||||||
|
|
Loading…
Reference in a new issue