v1.0.1a: block /minecraft:* command bypass

Author: VillainsRule

README.md

@@ -21,7 +21,8 @@
     - /give & /setblock
     - /function
     - /seed
-  - Keep in mind that this also blocks the console and command blocks!
+  - This applies to the client and console.
+  - This also blocks command "hacks", such as /minecraft:tp.
 
 <br>
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>xyz.villainsrule</groupId>
     <artifactId>noop</artifactId>
-    <version>1.0.0a</version>
+    <version>1.0.1a</version>
     <packaging>jar</packaging>
 
     <name>NoOP</name>

src/main/java/xyz/villainsrule/noop/NoOP.java

@@ -2,12 +2,14 @@
 
 import org.bukkit.plugin.java.JavaPlugin;
 
+import xyz.villainsrule.noop.listeners.CommandListener;
 import xyz.villainsrule.noop.listeners.PermissionListener;
 
 public class NoOP extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        getServer().getPluginManager().registerEvents(new CommandListener(), this);
         getServer().getPluginManager().registerEvents(new PermissionListener(), this);
     }
 }

src/main/java/xyz/villainsrule/noop/listeners/CommandListener.java

@@ -0,0 +1,38 @@
+package xyz.villainsrule.noop.listeners;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.server.ServerCommandEvent;
+
+public class CommandListener implements Listener {
+    List<String> blockedCommands = Arrays.asList("defaultgamemode", "deop", "function", "gamemode", "give", "op", "seed", "setblock", "teleport", "tp");
+
+    @EventHandler
+    public void onPlayerCommand(PlayerCommandPreprocessEvent event) {
+        Player player = event.getPlayer();
+        String message = event.getMessage();
+
+        String[] commandParts = message.split(" ")[0].split(":");
+
+        if (Arrays.stream(commandParts).anyMatch(blockedCommands::contains)) {
+            event.setCancelled(true);
+
+            if (player != null) player.setOp(false);
+        }
+    }
+
+    @EventHandler
+    public void onConsoleCommand(ServerCommandEvent event) {
+        String command = event.getCommand();
+
+        String[] commandParts = command.split(" ")[0].split(":");
+
+        if (Arrays.stream(commandParts).anyMatch(blockedCommands::contains))
+            event.setCancelled(true);
+    }
+}

src/main/java/xyz/villainsrule/noop/listeners/PermissionListener.java

@@ -21,7 +21,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
     }
 
     @EventHandler
-    public void onCommandEvent(PlayerCommandPreprocessEvent event) {
+    public void onCommand(PlayerCommandPreprocessEvent event) {
         Player player = event.getPlayer();
 
         if (checkPermissions(player))

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: NoOP
-version: 1.0.0a
+version: 1.0.1a
 main: xyz.villainsrule.noop.NoOP
 
 commands: