Skip to content

Commit 6d922f6

Browse files
fix: Add checks if asn is already black- or whitelisted
Signed-off-by: masel.io <git@byteexception.eu>
1 parent 7665c7c commit 6d922f6

File tree

1 file changed

+30
-8
lines changed

1 file changed

+30
-8
lines changed

bungee/src/main/java/ls/ni/networkfilter/bungee/commands/NetworkFilterCommand.java

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import net.md_5.bungee.api.chat.TextComponent;
88
import net.md_5.bungee.api.plugin.Command;
99

10+
import java.util.List;
11+
1012
public class NetworkFilterCommand extends Command {
1113

1214
public NetworkFilterCommand() {
@@ -31,20 +33,40 @@ public void execute(CommandSender commandSender, String[] args) {
3133
Config config = NetworkFilterCommon.getConfig();
3234

3335
if (args[0].equalsIgnoreCase("whitelist")) {
36+
List<Integer> asnWhitelist = config.getAsnWhitelist();
37+
3438
if (args[1].equalsIgnoreCase("add")) {
35-
config.getAsnWhitelist().add(asn);
36-
commandSender.sendMessage(TextComponent.fromLegacy("§aAdded ASN " + asn + " to whitelist"));
39+
if (asnWhitelist.contains(asn)) {
40+
commandSender.sendMessage(TextComponent.fromLegacy("§cASN " + asn + " is already in the whitelist"));
41+
} else {
42+
asnWhitelist.add(asn);
43+
commandSender.sendMessage(TextComponent.fromLegacy("§aAdded ASN " + asn + " to whitelist"));
44+
}
3745
} else {
38-
config.getAsnWhitelist().remove(asn);
39-
commandSender.sendMessage(TextComponent.fromLegacy("§aRemoved ASN " + asn + " from whitelist"));
46+
if (asnWhitelist.contains(asn)) {
47+
asnWhitelist.remove(asn);
48+
commandSender.sendMessage(TextComponent.fromLegacy("§aRemoved ASN " + asn + " from whitelist"));
49+
} else {
50+
commandSender.sendMessage(TextComponent.fromLegacy("§cASN " + asn + " is not in the whitelist"));
51+
}
4052
}
4153
} else {
54+
List<Integer> asnBlacklist = config.getAsnBlacklist();
55+
4256
if (args[1].equalsIgnoreCase("add")) {
43-
config.getAsnBlacklist().add(asn);
44-
commandSender.sendMessage(TextComponent.fromLegacy("§aAdded ASN " + asn + " to blacklist"));
57+
if (asnBlacklist.contains(asn)) {
58+
commandSender.sendMessage(TextComponent.fromLegacy("§cASN " + asn + " is already in the blacklist"));
59+
} else {
60+
asnBlacklist.add(asn);
61+
commandSender.sendMessage(TextComponent.fromLegacy("§aAdded ASN " + asn + " to blacklist"));
62+
}
4563
} else {
46-
config.getAsnBlacklist().remove(asn);
47-
commandSender.sendMessage(TextComponent.fromLegacy("§aRemoved ASN " + asn + " from blacklist"));
64+
if (asnBlacklist.contains(asn)) {
65+
asnBlacklist.remove(asn);
66+
commandSender.sendMessage(TextComponent.fromLegacy("§aRemoved ASN " + asn + " from blacklist"));
67+
} else {
68+
commandSender.sendMessage(TextComponent.fromLegacy("§cASN " + asn + " is not in the blacklist"));
69+
}
4870
}
4971
}
5072
}

0 commit comments

Comments
 (0)