implemented op only commands

OctoPvP · Jun 13, 2022 · 1c184f9 · 1c184f9
1 parent 89216ee
commit 1c184f9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/Commander-Bukkit/src/main/java/net/octopvp/commander/bukkit/BukkitCommandSender.java b/Commander-Bukkit/src/main/java/net/octopvp/commander/bukkit/BukkitCommandSender.java
@@ -13,6 +13,8 @@ public interface BukkitCommandSender extends CoreCommandSender {
 
     boolean isConsole();
 
+    boolean isOp();
+
     Player getPlayer();
 
     UUID getUUID();

diff --git a/Commander-Bukkit/src/main/java/net/octopvp/commander/bukkit/BukkitCommander.java b/Commander-Bukkit/src/main/java/net/octopvp/commander/bukkit/BukkitCommander.java
@@ -3,6 +3,7 @@
 import net.octopvp.commander.Commander;
 import net.octopvp.commander.CommanderImpl;
 import net.octopvp.commander.bukkit.annotation.ConsoleOnly;
+import net.octopvp.commander.bukkit.annotation.OpOnly;
 import net.octopvp.commander.bukkit.annotation.PlayerOnly;
 import net.octopvp.commander.bukkit.impl.BukkitCommandSenderImpl;
 import net.octopvp.commander.bukkit.impl.BukkitHelpService;
@@ -38,6 +39,11 @@ public static Commander getCommander(Plugin plugin) {
                         if (!sender.isConsole()) {
                             throw new CommandParseException("You must be a console to use this command.");
                         }
+                    }else if (ctx.getCommandInfo().isAnnotationPresent(OpOnly.class)) {
+                        BukkitCommandSender sender = (BukkitCommandSender) ctx.getCommandSender();
+                        if (!sender.isOp()) {
+                            throw new CommandParseException("You must be a console to use this command.");
+                        }
                     }
                 })
                 ;

diff --git a/Commander-Bukkit/src/main/java/net/octopvp/commander/bukkit/annotation/OpOnly.java b/Commander-Bukkit/src/main/java/net/octopvp/commander/bukkit/annotation/OpOnly.java
@@ -0,0 +1,14 @@
+package net.octopvp.commander.bukkit.annotation;
+
+import net.octopvp.commander.annotation.DistributeOnMethods;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+@DistributeOnMethods
+public @interface OpOnly {
+}
diff --git a/...ander-Bukkit/src/main/java/net/octopvp/commander/bukkit/impl/BukkitCommandSenderImpl.java b/...ander-Bukkit/src/main/java/net/octopvp/commander/bukkit/impl/BukkitCommandSenderImpl.java
@@ -28,6 +28,11 @@ public boolean isConsole() {
         return commandSender instanceof ConsoleCommandSender;
     }
 
+    @Override
+    public boolean isOp() {
+        return commandSender.isOp();
+    }
+
     @Override
     public Player getPlayer() {
         if (!(isPlayer())) throw new CommandException("You must be a player to do this!");