Add warning for npc select within commands

CitizensDev · Dec 27, 2022 · cdb75db · cdb75db
1 parent 027e4d2
commit cdb75db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommandSelector.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommandSelector.java
@@ -107,8 +107,8 @@ public static void startWithCallback(Callback callback, NPCRegistry npcRegistry,
             String name = args.getString(1);
             List<NPC> possible = Lists.newArrayList();
             double range = -1;
-            if (args.hasValueFlag("r")) {
-                range = Math.abs(args.getFlagDouble("r"));
+            if (args.hasValueFlag("range")) {
+                range = Math.abs(args.getFlagDouble("range"));
             }
             for (NPC test : npcRegistry) {
                 if (test.getName().equalsIgnoreCase(name)) {

diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -455,6 +455,9 @@ public void command(CommandContext args, CommandSender sender, NPC npc, @Flag("p
             if (permissions != null) {
                 perms.addAll(Arrays.asList(permissions.split(",")));
             }
+            if (command.startsWith("npc select")) {
+                throw new CommandException("npc select not currently supported within commands. Use --id <id> instead");
+            }
             try {
                 int id = commands.addCommand(new NPCCommandBuilder(command, hand).addPerms(perms)
                         .player(args.hasFlag('p') || args.hasFlag('o')).op(args.hasFlag('o')).cooldown(cooldown)
@@ -2270,7 +2273,7 @@ public void script(CommandContext args, CommandSender sender, NPC npc, @Flag("ad
 
     @Command(
             aliases = { "npc" },
-            usage = "select|sel [id|name] (--r range) (--registry [name])",
+            usage = "select|sel [id|name] (--range range) (--registry [name])",
             desc = "Select a NPC with the given ID or name",
             modifiers = { "select", "sel" },
             min = 1,

diff --git a/main/src/main/java/net/citizensnpcs/util/Util.java b/main/src/main/java/net/citizensnpcs/util/Util.java
@@ -355,27 +355,29 @@ public static void runCommand(NPC npc, Player clicker, String command, boolean o
             Messaging.debug("Running command " + interpolatedCommand + " on NPC " + (npc == null ? -1 : npc.getId())
                     + " clicker " + clicker);
         }
+
         if (!player) {
             Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), interpolatedCommand);
             return;
         }
+
         boolean wasOp = clicker.isOp();
         if (op) {
             clicker.setOp(true);
         }
 
-        if (bungeeServer != null) {
-            ByteArrayDataOutput out = ByteStreams.newDataOutput();
-            out.writeUTF("Connect");
-            out.writeUTF(bungeeServer);
+        try {
+            if (bungeeServer != null) {
+                ByteArrayDataOutput out = ByteStreams.newDataOutput();
+                out.writeUTF("Connect");
+                out.writeUTF(bungeeServer);
 
-            clicker.sendPluginMessage(CitizensAPI.getPlugin(), "BungeeCord", out.toByteArray());
-        } else {
-            try {
+                clicker.sendPluginMessage(CitizensAPI.getPlugin(), "BungeeCord", out.toByteArray());
+            } else {
                 clicker.chat("/" + interpolatedCommand);
-            } catch (Throwable t) {
-                t.printStackTrace();
             }
+        } catch (Throwable t) {
+            t.printStackTrace();
         }
 
         if (op) {