greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

v1.0.3 #370

Merged
greg6775 merged 18 commits from greg-dev into master 2020-02-15 14:37:33 +01:00
Conversation 0 Commits 18 Files changed 8 +2 -3
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1f3a9023d4 - Show all commits

3
src/main/java/com/bbn/hadder/core/CommandHandler.java
View file

@ -76,8 +76,7 @@ public class CommandHandler {
} }
} }
} }
if (run) if (run) cmd.executed(args, commandEvent);
cmd.executed(args, commandEvent);
else event.getMessage().addReaction("❌").queue(); else event.getMessage().addReaction("❌").queue();
return; return;
} }

2
src/main/java/com/bbn/hadder/utils/MessageEditor.java
View file

@ -133,6 +133,6 @@ public class MessageEditor {
ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale); ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale);
if (resourceBundle.containsKey(string)) if (resourceBundle.containsKey(string))
return resourceBundle.getString(string).replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two); return resourceBundle.getString(string).replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two);
else return "This key doesn't exist. Please report this to the Bot Developers. Key: " + string + " Language_code: " + language_code; else return "This key doesn't exist. Please report this to the Bot Developers. Key: `" + string + "` Language_code: `" + language_code + "`";
} }
} }