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

v1.0.1 #355

Merged
greg6775 merged 58 commits from greg-dev into master 2020-02-02 19:06:01 +01:00
Conversation 0 Commits 58 Files changed 33 +4 -5
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cdff88174f - Show all commits

6
src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
View file

@ -41,7 +41,7 @@ public class BlacklistCommand implements Command {
if (args.length == 3) {
String blacklisted = e.getRethinkUser().getBlacklisted();
List<String> commands = new ArrayList<>();
if (!(null == blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
if (null != blacklisted) commands.addAll(Arrays.asList(blacklisted.split(",")));
commands.addAll(Arrays.asList(args[1].split(",")));
LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
@ -61,7 +61,7 @@ public class BlacklistCommand implements Command {
if (args.length == 3) {
String blacklisted = e.getRethinkUser().getBlacklisted();
List<String> commands = new ArrayList<>();
if (!(null == blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
if (null != blacklisted) commands.addAll(Arrays.asList(blacklisted.split(",")));
commands.removeAll(Arrays.asList(args[1].split(",")));
LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
@ -82,7 +82,7 @@ public class BlacklistCommand implements Command {
for (User user : e.getJDA().getUsers()) {
if (!user.getId().equals(e.getJDA().getSelfUser().getId())) {
String blacklisted = e.getRethinkUser().getBlacklisted();
if (!(null == blacklisted)) {
if (null != blacklisted) {
stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n");
}
}

1
src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
View file

@ -19,7 +19,6 @@ package com.bbn.hadder.commands.settings;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder;
public class LanguageCommand implements Command {

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

@ -69,7 +69,7 @@ public class CommandHandler {
boolean run = true;
String blacklisted = rethinkUser.getBlacklisted();
if (!(null == blacklisted)) {
if (null != blacklisted) {
for (String BLLabel : blacklisted.split(",")) {
if (Arrays.asList(cmd.labels()).contains(BLLabel)) {
run = false;