Merge pull request #316 from babbaj/master

Never send chat message when using prefix
This commit is contained in:
Leijurv 2019-01-20 09:21:51 -08:00
commit 0de1517bd8
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A

View File

@ -77,6 +77,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);
}
@ -87,14 +89,17 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
return;
}
String msg = event.getMessage();
if (Baritone.settings().prefix.get()) {
if (!msg.startsWith("#")) {
return;
if (Baritone.settings().prefix.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();
}
msg = msg.substring(1);
}
if (runCommand(msg)) {
event.cancel();
}
}
@ -121,7 +126,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(" ");