diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java index 30265d7..c000356 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java @@ -74,9 +74,7 @@ public class ScreenShareCommand implements Command { .setDescription("http://discordapp.com/channels/" + e.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue(); } } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index 6fd6bb2..d179018 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -58,8 +58,6 @@ public class BanCommand implements Command { "commands.moderation.ban.error.title", "commands.moderation.ban.yourself.error.description").build()).queue(); } - } else if (e.getMessage().getMentionedMembers().size() == 0) { - e.getHelpCommand().sendHelp(this, e); } else if (e.getMessage().getMentionedMembers().size() > 1) { for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { Member member = e.getMessage().getMentionedMembers().get(i); @@ -89,7 +87,7 @@ public class BanCommand implements Command { "", "commands.moderation.ban.massban.success.description", String.valueOf(e.getMessage().getMentionedMembers().size())).build()).queue(); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index 9f6fc14..d595aa7 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -92,9 +92,7 @@ public class ClearCommand implements Command { } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index 5205372..bd1e4cd 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -69,9 +69,7 @@ public class InviteDetectCommand implements Command { default: e.getHelpCommand().sendHelp(this, e); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 990042f..5784644 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -54,8 +54,6 @@ public class KickCommand implements Command { } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue(); } - } else if (e.getMessage().getMentionedMembers().size() == 0) { - e.getHelpCommand().sendHelp(this, e); } else if (e.getMessage().getMentionedMembers().size() > 1) { for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { Member member = e.getMessage().getMentionedMembers().get(i); @@ -74,7 +72,7 @@ public class KickCommand implements Command { } } e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "✅", "commands.moderation.kick.masskick.success.description", String.valueOf(e.getMessage().getMentionedMembers().size())).build()).queue(); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 1849238..40415bd 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -54,9 +54,7 @@ public class NickCommand implements Command { "commands.moderation.nick.success.description", e.getMessage().getMentionedMembers().get(0).getUser().getAsTag() ).build()).queue(); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } @@ -81,9 +79,7 @@ public class NickCommand implements Command { ).build()).queue(); } } - } else if (e.getMessage().getMentionedMembers().size() == 0) { - e.getHelpCommand().sendHelp(this, e); - } else { + } else if (e.getMessage().getMentionedUsers().size() > 1) { for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { Member member = e.getMessage().getMentionedMembers().get(i); if (!e.getJDA().getSelfUser().getId().equals(member.getId())) { @@ -99,7 +95,7 @@ public class NickCommand implements Command { "✅", "commands.moderation.nick.myself.success.description", String.valueOf(e.getMessage().getMentionedMembers().size()) ).build()).queue(); - } + } else e.getHelpCommand().sendHelp(this, e); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java index a6db1db..7b4737b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java @@ -34,7 +34,7 @@ public class PrefixCommand implements Command { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.prefix.success.title", - "✅", + "", "commands.moderation.prefix.success.description", args[0]).build() ).queue(); @@ -45,9 +45,7 @@ public class PrefixCommand implements Command { "", "commands.moderation.prefix.error.description").build()).queue(); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index 3799f7f..9094bcd 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -95,9 +95,7 @@ public class RoleCommand implements Command { } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index 59bdb7b..03629d5 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -39,12 +39,10 @@ public class StarboardCommand implements Command { if (channel!=null) { e.getRethinkServer().setStarboard(channel.getId()); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } - if (args.length==2) { + if (args.length == 2) { e.getRethinkServer().setNeededStars(args[1]); } diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index f573ce5..5d0f8f7 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -96,9 +96,7 @@ public class EvalCommand implements Command { }, 0, TimeUnit.MILLISECONDS); - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java index 15bc1a9..0db2850 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java @@ -41,9 +41,7 @@ public class GuildLeaveCommand implements Command { } catch (Exception ex) { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue(); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index e09a44a..7c6ab93 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -54,9 +54,7 @@ public class LanguageCommand implements Command { .build()).queue(); break; } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } public void setLanguage(String language_code, String language, CommandEvent e) { diff --git a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java index 4b17d3f..3867bb4 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java @@ -32,9 +32,7 @@ public class UserPrefixCommand implements Command { .build()) .queue(); e.getRethinkUser().push(); - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index c19c9dc..01d2f6e 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -323,6 +323,6 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. commands.settings.language.help.description = Sets the new primary language for a user. -commands.settings.prefix.success.title = %extra% Successfully set %extra% +commands.settings.prefix.success.title = Successfully set prefix commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`. commands.settings.prefix.help.description = Sets a new prefix.