Skip to content
This repository was archived by the owner on Dec 31, 2024. It is now read-only.

Commit e0e1469

Browse files
committed
check if all versions are blocked
1 parent 29a2986 commit e0e1469

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/main/java/lol/hyper/bungeeblockversion/BungeeBlockVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public final class BungeeBlockVersion extends Plugin implements Listener {
3838

3939
public ConfigHandler configHandler;
4040
public JoinEvent joinEvent;
41-
public MiniMessage miniMessage = MiniMessage.miniMessage();
41+
public final MiniMessage miniMessage = MiniMessage.miniMessage();
4242
private BungeeAudiences adventure;
4343

4444
@Override

src/main/java/lol/hyper/bungeeblockversion/events/JoinEvent.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,12 @@ public void onPreConnect(LoginEvent event) {
4545
if (ConfigHandler.versions.contains(event.getConnection().getVersion())) {
4646
event.setCancelled(true);
4747
String blockedMessage = ConfigHandler.configuration.getString("disconnect-message");
48+
String allowedVersions = VersionToStrings.allowedVersions(ConfigHandler.versions);
49+
if (allowedVersions == null) {
50+
blockedMessage = "<red>All versions are currently blocked from playing.</red>";
51+
}
4852
if (blockedMessage.contains("{VERSIONS}")) {
49-
blockedMessage = blockedMessage.replace("{VERSIONS}", VersionToStrings.allowedVersions(ConfigHandler.versions));
53+
blockedMessage = blockedMessage.replace("{VERSIONS}", allowedVersions);
5054
}
5155
Component blockedMessageComponent = bungeeBlockVersion.miniMessage.deserialize(blockedMessage);
5256
BaseComponent blockedMessageBaseComponent = new TextComponent(BungeeComponentSerializer.get().serialize(blockedMessageComponent));

src/main/java/lol/hyper/bungeeblockversion/tools/VersionToStrings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static String allowedVersions(List<Integer> deniedVersions) {
7171
List<Integer> allVersions = new ArrayList<>(versionStrings.keySet());
7272
allVersions.removeAll(deniedVersions);
7373
if (allVersions.isEmpty()) {
74-
return "none";
74+
return null;
7575
}
7676
int minVersion = Collections.min(allVersions);
7777
int maxVersion = Collections.max(allVersions);

0 commit comments

Comments
 (0)