From a5dea9e7f682b4af9a703ac9fabd2dc0283dfeb7 Mon Sep 17 00:00:00 2001 From: N0tMyFaultOG Date: Mon, 24 Aug 2020 20:51:23 +0200 Subject: [PATCH] Permission cleanup --- Bukkit/src/main/resources/plugin.yml | 4 +--- Core/src/main/java/com/plotsquared/core/command/Confirm.java | 2 +- Core/src/main/java/com/plotsquared/core/command/Toggle.java | 2 +- .../java/com/plotsquared/core/permissions/Permission.java | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Bukkit/src/main/resources/plugin.yml b/Bukkit/src/main/resources/plugin.yml index 244522c4d..b3a485d72 100644 --- a/Bukkit/src/main/resources/plugin.yml +++ b/Bukkit/src/main/resources/plugin.yml @@ -210,7 +210,7 @@ permissions: default: false plots.admin.entry.forcefield: default: false - plots.admin.command.chat: + plots.admin.command.chatspy: default: false plots.admin.caps.other: default: false @@ -236,8 +236,6 @@ permissions: default: false plots.admin.build.heightlimit: default: false - plots.admin.command.update: - default: false plots.admin.command.rate: default: false plots.admin.command.trust: diff --git a/Core/src/main/java/com/plotsquared/core/command/Confirm.java b/Core/src/main/java/com/plotsquared/core/command/Confirm.java index 98fc3b39a..9ed7b7f35 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Confirm.java +++ b/Core/src/main/java/com/plotsquared/core/command/Confirm.java @@ -31,7 +31,7 @@ import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.TaskManager; @CommandDeclaration(command = "confirm", - permission = "plots.use", + permission = "plots.confirm", category = CommandCategory.INFO) public class Confirm extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/Toggle.java b/Core/src/main/java/com/plotsquared/core/command/Toggle.java index 66a34a4d3..643d9e5a4 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Toggle.java +++ b/Core/src/main/java/com/plotsquared/core/command/Toggle.java @@ -44,7 +44,7 @@ public class Toggle extends Command { @CommandDeclaration(command = "chatspy", aliases = {"spy"}, - permission = "plots.admin.command.chat") + permission = "plots.admin.command.chatspy") public void chatspy(Command command, PlotPlayer player, String[] args, RunnableVal3 confirm, RunnableVal2 whenDone) { diff --git a/Core/src/main/java/com/plotsquared/core/permissions/Permission.java b/Core/src/main/java/com/plotsquared/core/permissions/Permission.java index 028ca7e2b..27aa9fce8 100644 --- a/Core/src/main/java/com/plotsquared/core/permissions/Permission.java +++ b/Core/src/main/java/com/plotsquared/core/permissions/Permission.java @@ -49,7 +49,7 @@ public enum Permission { PERMISSION_ADMIN_ENTRY_DENIED("plots.admin.entry.denied"), PERMISSION_ADMIN_VISIT_UNTRUSTED("plots.admin.visit.untrusted"), PERMISSION_ADMIN_ENTRY_FORCEFIELD("plots.admin.entry.forcefield"), - PERMISSION_COMMANDS_CHAT("plots.admin.command.chat"), + PERMISSION_ADMIN_COMMANDS_CHATSPY("plots.admin.command.chatspy"), PERMISSION_MERGE_OTHER("plots.merge.other"), PERMISSION_MERGE_KEEP_ROAD("plots.merge.keeproad"), PERMISSION_ADMIN_CAPS_OTHER("plots.admin.caps.other"), @@ -64,7 +64,6 @@ public enum Permission { PERMISSION_ADMIN_INTERACT_UNOWNED("plots.admin.interact.unowned"), PERMISSION_ADMIN_INTERACT_OTHER("plots.admin.interact.other"), PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT("plots.admin.build.heightlimit"), - PERMISSION_ADMIN_UPDATE("plots.admin.command.update"), PERMISSION_ADMIN_COMMAND_RATE("plots.admin.command.rate"), PERMISSION_ADMIN_COMMAND_TRUST("plots.admin.command.trust"), PERMISSION_TRUST_EVERYONE("plots.trust.everyone"),