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

Merge Greg's branch into Hax's branch #228

Merged
greg6775 merged 21 commits from greg-dev into hax-dev 2019-12-21 18:10:28 +01:00
Conversation 0 Commits 21 Files changed 31 +1 -1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 29374518ff - Show all commits

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

@ -35,7 +35,7 @@ public class MessageEditor {
public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra, String title_extra_two, public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra, String title_extra_two,
String description_language_string, String description_extra, String description_extra_two) { String description_language_string, String description_extra, String description_extra_two) {
String language = rethink.getLanguage(this.user.getId()); String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null;
EmbedBuilder eb = this.getDefaultSettings(type); EmbedBuilder eb = this.getDefaultSettings(type);
if (!title_language_string.equals("")) eb.setTitle(this.handle(language, title_language_string, title_extra, title_extra_two)); if (!title_language_string.equals("")) eb.setTitle(this.handle(language, title_language_string, title_extra, title_extra_two));
if (!description_language_string.equals("")) eb.setDescription(this.handle(language, description_language_string, description_extra, description_extra_two)); if (!description_language_string.equals("")) eb.setDescription(this.handle(language, description_language_string, description_extra, description_extra_two));