allow prefix and non prefix control at the same time

cabaletta · Feb 5, 2019 · 4aededf · 4aededf
1 parent ed8f986
commit 4aededf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java
@@ -481,7 +481,7 @@ public final class Settings {
     /**
      * Whether or not to use the "#" command prefix
      */
-    public final Setting<Boolean> prefix = new Setting<>(false);
+    public final Setting<Boolean> prefixControl = new Setting<>(true);
 
     /**
      * Don't stop walking forward when you need to break blocks in your way

diff --git a/src/main/java/baritone/utils/ExampleBaritoneControl.java b/src/main/java/baritone/utils/ExampleBaritoneControl.java
@@ -87,22 +87,22 @@ public ExampleBaritoneControl(Baritone baritone) {
 
     @Override
     public void onSendChatMessage(ChatEvent event) {
-        if (!Baritone.settings().chatControl.get() && !Baritone.settings().removePrefix.get()) {
-            return;
-        }
         String msg = event.getMessage();
-        if (Baritone.settings().prefix.get()) {
+        if (Baritone.settings().prefixControl.get()) {
             if (msg.startsWith(COMMAND_PREFIX)) {
                 if (!runCommand(msg.substring(COMMAND_PREFIX.length()))) {
                     logDirect("Invalid command");
                 }
-                event.cancel(); // always cancel if using prefix
-            }
-        } else {
-            if (runCommand(msg)) {
-                event.cancel();
+                event.cancel(); // always cancel if using prefixControl
+                return;
             }
         }
+        if (!Baritone.settings().chatControl.get() && !Baritone.settings().removePrefix.get()) {
+            return;
+        }
+        if (runCommand(msg)) {
+            event.cancel();
+        }
     }
 
     public boolean runCommand(String msg0) { // you may think this can be private, but impcat calls it from .b =)