fix permission check

CatEricka · Jan 6, 2022 · 831a4bb · 831a4bb
1 parent a497e8b
commit 831a4bb
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 12 deletions.
diff --git a/src/main/java/com/github/catericka/wsm/commands/WsmCommand.java b/src/main/java/com/github/catericka/wsm/commands/WsmCommand.java
@@ -52,6 +52,11 @@ private Command getSubCommand(String name) {
 
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
+        if (!testPermissionSilent(sender)) {
+            sender.sendMessage(configManager.messages.chatPrefix + " " + configManager.messages.AccessDenied);
+            return true;
+        }
+
         if (args.length == 0) {
             if (sender instanceof Player) {
                 return onPlayerExecute((Player) sender, commandLabel, args);

diff --git a/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandDisable.java b/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandDisable.java
@@ -32,7 +32,7 @@ public WsmCommandDisable() {
         this.setAliases(Lists.newArrayList("off", "0"));
         this.setDescription(configManager.messages.cDisable);
         this.setPermission(Permissions.ADMIN.toString());
-        this.setPermissionMessage(configManager.messages.AccesDenied);
+        this.setPermissionMessage(configManager.messages.AccessDenied);
     }
 
     @Override

diff --git a/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandEnable.java b/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandEnable.java
@@ -35,7 +35,7 @@ public WsmCommandEnable()
 		setAliases(Lists.newArrayList("on", "1"));
 		setDescription(configManager.messages.cEnable);
 		setPermission(Permissions.ADMIN.toString());
-		setPermissionMessage(configManager.messages.AccesDenied);
+		setPermissionMessage(configManager.messages.AccessDenied);
 	}
 
 	@Override

diff --git a/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandExcludeAdd.java b/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandExcludeAdd.java
@@ -22,7 +22,7 @@ public WsmCommandExcludeAdd() {
         super("exclude_add");
         this.setAliases(Lists.newArrayList("add"));
         this.setPermission(Permissions.ADMIN.toString());
-        this.setPermissionMessage(configManager.messages.AccesDenied);
+        this.setPermissionMessage(configManager.messages.AccessDenied);
     }
 
     @Override

diff --git a/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandExcludeClear.java b/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandExcludeClear.java
@@ -16,7 +16,7 @@ public WsmCommandExcludeClear() {
         super("exclude_clear");
         this.setAliases(Lists.newArrayList("clear"));
         this.setPermission(Permissions.ADMIN.toString());
-        this.setPermissionMessage(configManager.messages.AccesDenied);
+        this.setPermissionMessage(configManager.messages.AccessDenied);
     }
 
     @Override

diff --git a/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandExcludeList.java b/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandExcludeList.java
@@ -18,7 +18,7 @@ public WsmCommandExcludeList() {
         super("exclude_list");
         this.setAliases(Lists.newArrayList("list"));
         this.setPermission(Permissions.ADMIN.toString());
-        this.setPermissionMessage(configManager.messages.AccesDenied);
+        this.setPermissionMessage(configManager.messages.AccessDenied);
     }
 
     @Override

diff --git a/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandHelp.java b/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandHelp.java
@@ -31,7 +31,7 @@ public WsmCommandHelp() {
         super("help");
         this.setDescription(StringUtils.join(configManager.messages.cHelp, "\n"));
         this.setPermission(Permissions.ADMIN.toString());
-        this.setPermissionMessage(configManager.messages.AccesDenied);
+        this.setPermissionMessage(configManager.messages.AccessDenied);
     }
 
     @Override

diff --git a/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandMaxXZ.java b/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandMaxXZ.java
@@ -15,7 +15,7 @@ public WsmCommandMaxXZ() {
         super("maxXZ");
         this.setAliases(Lists.newArrayList("xz"));
         this.setPermission(Permissions.ADMIN.toString());
-        this.setPermissionMessage(configManager.messages.AccesDenied);
+        this.setPermissionMessage(configManager.messages.AccessDenied);
     }
 
     @Override

diff --git a/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandMaxY.java b/src/main/java/com/github/catericka/wsm/commands/subcommands/WsmCommandMaxY.java
@@ -15,7 +15,7 @@ public WsmCommandMaxY() {
         super("maxY");
         this.setAliases(Lists.newArrayList("y"));
         this.setPermission(Permissions.ADMIN.toString());
-        this.setPermissionMessage(configManager.messages.AccesDenied);
+        this.setPermissionMessage(configManager.messages.AccessDenied);
     }
 
     @Override

diff --git a/src/main/java/com/github/catericka/wsm/commands/subcommands/WssCommandCancel.java b/src/main/java/com/github/catericka/wsm/commands/subcommands/WssCommandCancel.java
@@ -14,7 +14,7 @@ public class WssCommandCancel extends Command {
     public WssCommandCancel() {
         super("cancel");
         setPermission(Permissions.ADMIN.toString());
-        setPermissionMessage(configManager.messages.AccesDenied);
+        setPermissionMessage(configManager.messages.AccessDenied);
     }
 
     @Override

diff --git a/src/main/java/com/github/catericka/wsm/configuration/entities/Messages.java b/src/main/java/com/github/catericka/wsm/configuration/entities/Messages.java
@@ -38,7 +38,7 @@ public class Messages implements IConfig {
 
     public String sReload = "Wsm has been reloaded";
 
-    public String AccesDenied = "You don't have permission to do that!";
+    public String AccessDenied = "You don't have permission to do that!";
     public String ePlayer = "This command can only be executed by a player";
     public String eMaxXZ = "X-Z length must be positive!";
     public String eMaxY = "Y length must be positive!";
@@ -67,7 +67,7 @@ public Messages(Map<String, Object> map) {
 
         sReload = getOrDefault(map, "success.reload", sReload);
 
-        AccesDenied = getOrDefault(map, "errors.AccesDenied", AccesDenied);
+        AccessDenied = getOrDefault(map, "errors.AccessDenied", AccessDenied);
         ePlayer = getOrDefault(map, "errors.player", ePlayer);
         eMaxXZ = getOrDefault(map, "errors.maxXZ", eMaxXZ);
         eMaxY = getOrDefault(map, "errors.maxY", eMaxY);
@@ -97,7 +97,7 @@ public Messages(Map<String, Object> map) {
 
         setValue(map, "success.reload", sReload);
 
-        setValue(map, "errors.AccesDenied", AccesDenied);
+        setValue(map, "errors.AccessDenied", AccessDenied);
         setValue(map, "errors.player", ePlayer);
         setValue(map, "errors.maxXZ", eMaxXZ);
         setValue(map, "errors.maxY", eMaxY);

diff --git a/src/main/java/com/github/catericka/wsm/listeners/PlayerListener.java b/src/main/java/com/github/catericka/wsm/listeners/PlayerListener.java
@@ -46,6 +46,11 @@ public void onPlayerInteract(PlayerInteractEvent event) {
 		// Get the player
         final Player player = event.getPlayer();
 
+        if (!Permissions.has(player, Permissions.ADMIN)) {
+            player.sendMessage(configManager.messages.chatPrefix + " " + configManager.messages.AccessDenied);
+            return;
+        }
+
         if (!WsmApi.isEnable(player)) return;
 
         if ((event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_BLOCK)