From 326890cb7ab8ee504a722e0c972fee316db9c355 Mon Sep 17 00:00:00 2001 From: Juul Damen <31408341+Juuldamen@users.noreply.github.com> Date: Mon, 30 Jul 2018 08:09:21 +0200 Subject: [PATCH] Add missing killcount command config (#4489) Add missing toggle for enabling !kc command to chat commands config --- .../plugins/chatcommands/ChatCommandsConfig.java | 11 +++++++++++ .../plugins/chatcommands/ChatCommandsPlugin.java | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsConfig.java index 215fd75fc6..1aba2b1d54 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsConfig.java @@ -66,6 +66,17 @@ public interface ChatCommandsConfig extends Config @ConfigItem( position = 3, + keyName = "killcount", + name = "Killcount Command", + description = "Configures whether the Killcount command is enabled" + ) + default boolean killcount() + { + return true; + } + + @ConfigItem( + position = 4, keyName = "clearShortcuts", name = "Clear shortcuts", description = "Enable shortcuts (ctrl+w and backspace) for clearing the chatbox" diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 80578b15aa..8612ee1f19 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -215,7 +215,7 @@ public class ChatCommandsPlugin extends Plugin implements ChatboxInputListener log.debug("Running clue lookup for {}", search); executor.submit(() -> playerClueLookup(setMessage, search)); } - else if (message.toLowerCase().startsWith("!kc ")) + else if (config.killcount() && message.toLowerCase().startsWith("!kc ")) { String search = message.substring(4); @@ -322,7 +322,7 @@ public class ChatCommandsPlugin extends Plugin implements ChatboxInputListener public boolean onChatboxInput(ChatboxInput chatboxInput) { final String value = chatboxInput.getValue(); - if (!value.startsWith("!kc ") && !value.startsWith("/!kc ")) + if (!config.killcount() || !value.startsWith("!kc ") && !value.startsWith("/!kc ")) { return false; } @@ -361,7 +361,7 @@ public class ChatCommandsPlugin extends Plugin implements ChatboxInputListener public boolean onPrivateMessageInput(PrivateMessageInput privateMessageInput) { final String message = privateMessageInput.getMessage(); - if (!message.startsWith("!kc ")) + if (!config.killcount() || !message.startsWith("!kc ")) { return false; }