From 9515f6d2202300d10f5e5667d946603bb41f2fa2 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Tue, 31 Dec 2019 22:29:40 +0100 Subject: [PATCH] Don't set stop to false --- .../java/net/runelite/client/chat/ChatCommandManager.java | 6 ++---- .../main/java/net/runelite/client/events/ChatInput.java | 7 +++++-- .../net/runelite/client/plugins/twitch/TwitchPlugin.java | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java index 10fc1c5b40..e036777272 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java @@ -151,12 +151,10 @@ public class ChatCommandManager } BiPredicate input = chatCommand.getInput(); - if (input == null) + if (input != null && input.test(chatInput, message)) { - return; + chatInput.setStop(); } - - chatInput.setStop(input.test(chatInput, message)); } private static String extractCommand(String message) diff --git a/runelite-client/src/main/java/net/runelite/client/events/ChatInput.java b/runelite-client/src/main/java/net/runelite/client/events/ChatInput.java index dea147a831..b237e0fdd1 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/ChatInput.java +++ b/runelite-client/src/main/java/net/runelite/client/events/ChatInput.java @@ -25,14 +25,17 @@ package net.runelite.client.events; import lombok.Getter; -import lombok.Setter; import net.runelite.api.events.Event; public abstract class ChatInput implements Event { @Getter - @Setter private boolean stop = false; + public void setStop() + { + this.stop = true; + } + public abstract void resume(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java index 5f0a2be3a1..ae5d7be18e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java @@ -219,6 +219,6 @@ public class TwitchPlugin extends Plugin implements TwitchListener addChatMessage(twitchConfig.username(), message); } - chatboxInput.setStop(true); + chatboxInput.setStop(); } }