Merge branch 'master' into mega-cancer-rendering

src/main/java/baritone/utils/ExampleBaritoneControl.java

@@ -79,6 +79,8 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
                     "costs - (debug) all movement costs from current location\n" +
                     "damn - Daniel ";
 
+    private static final String COMMAND_PREFIX = "#";
+
     public ExampleBaritoneControl(Baritone baritone) {
         super(baritone);
     }
@@ -90,17 +92,20 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
         }
         String msg = event.getMessage();
         if (Baritone.settings().prefix.get()) {
-            if (!msg.startsWith("#")) {
-                return;
+            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();
             }
-            msg = msg.substring(1);
-        }
-        if (runCommand(msg)) {
-            event.cancel();
         }
     }
 
-    public boolean runCommand(String msg0) {
+    public boolean runCommand(String msg0) { // you may think this can be private, but impcat calls it from .b =)
         String msg = msg0.toLowerCase(Locale.US).trim(); // don't reassign the argument LOL
         PathingBehavior pathingBehavior = baritone.getPathingBehavior();
         CustomGoalProcess customGoalProcess = baritone.getCustomGoalProcess();
@@ -123,7 +128,7 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
             for (String line : HELP_MSG.split("\n")) {
                 logDirect(line);
             }
-            return false;
+            return true;
         }
         if (msg.contains(" ")) {
             String[] data = msg.split(" ");