Merge branch 'master' of https://github.com/WebMCDevelopment/GriefPreventionWebMC

Author: colbster937

pom.xml

@@ -134,7 +134,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.5.4</version>
+                    <version>3.5.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

src/main/java/com/griefprevention/commands/UnifiedAdminClaimCommand.java

@@ -351,6 +351,17 @@ private boolean handleList(CommandSender sender, String[] args) {
     }
 
     private boolean handleBlocks(CommandSender sender, String[] args) {
+        // Look, I really don't want to fix permissions of dynamic cmd and plugin.yml and alias perms stuff: (unifiedcommandhandler.java)
+        // So I will assume this is the ONLY command that has a perms glitch and just stubbornly fix it in this brutal hardcoded way of checking onCommand
+        // Idk why I even have to do this, original code doesn't need checks here
+        // But I didn't modify any other /com/griefprevention/commands files so idk why I still have to
+        if (sender instanceof Player player) { // only check on player, console is good
+            if (!player.hasPermission("griefprevention.adjustclaimblocks")) { // REMEMBER TO GET A BETER SOLUTION LATER
+                GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoPermissionForCommand); // THIS IS ABSOLUTE AHH
+                return true;
+            }
+        }
+
         // Usage: /aclaim blocks <bonus|accrued> <player|all> <amount>
         if (args.length < 3) {
             if (sender instanceof Player) {
@@ -365,6 +376,13 @@ private boolean handleBlocks(CommandSender sender, String[] args) {
             return true;
         }
 
+        if (sender instanceof Player player) { // REMEMBER TO GET A BETER SOLUTION LATER THIS IS ABSOLUTE AHH
+            if (!player.hasPermission("griefprevention.adjustclaimblocks")) { // garbage vro
+                GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoPermissionForCommand);
+                return true;
+            }
+        }
+
         String type = args[0].toLowerCase();
         String target = args[1];
         int amount;