Skip to content

Commit ed6dc85

Browse files
committed
Fixed the fallback principal option and renamed it to something better
1 parent 0aec00e commit ed6dc85

File tree

6 files changed

+23
-15
lines changed

6 files changed

+23
-15
lines changed

src/main/java/com/jaimemartz/playerbalancer/commands/FallbackCommand.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@ public ServerSection getSection(ProxiedPlayer player) {
8888

8989
return target;
9090
} else {
91-
if (plugin.getSettings().getGeneralProps().isFallbackPrincipal()) {
91+
if (plugin.getSettings().getBalancerProps().isDefaultPrincipal()) {
9292
return plugin.getSectionManager().getPrincipal();
93+
} else {
94+
MessageUtils.send(player, messages.getUnavailableServerMessage());
9395
}
9496
}
9597

src/main/java/com/jaimemartz/playerbalancer/commands/ManageCommand.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,10 @@ public void execute(CommandSender sender, String[] args) {
190190
.color(ChatColor.WHITE)
191191
.append("\"")
192192
.color(ChatColor.AQUA)
193+
.append("\nAddress: ")
194+
.color(ChatColor.GRAY)
195+
.append(server.getAddress().toString())
196+
.color(ChatColor.AQUA)
193197
.create()))
194198
.append(String.format(" (%d/%d) ",
195199
status.getOnline(),

src/main/java/com/jaimemartz/playerbalancer/listener/ServerKickListener.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ private ServerSection getSection(ProxiedPlayer player, ServerInfo from) {
124124

125125
return target;
126126
} else {
127-
if (plugin.getSettings().getGeneralProps().isFallbackPrincipal()) {
127+
if (plugin.getSettings().getBalancerProps().isDefaultPrincipal()) {
128128
return plugin.getSectionManager().getPrincipal();
129+
} else {
130+
MessageUtils.send(player, messages.getUnavailableServerMessage());
129131
}
130132
}
131133

src/main/java/com/jaimemartz/playerbalancer/ping/StatusManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public void start() {
2828
stopped = false;
2929
tactic = plugin.getSettings().getServerCheckerProps().getTactic();
3030
plugin.getLogger().info(String.format("Starting the ping task, the interval is %s",
31-
plugin.getSettings().getServerCheckerProps().getInterval()));
31+
plugin.getSettings().getServerCheckerProps().getInterval()
32+
));
3233

3334
task = plugin.getProxy().getScheduler().schedule(plugin, () -> {
3435
storage.forEach((k, v) -> v.setOutdated(true));

src/main/java/com/jaimemartz/playerbalancer/settings/props/GeneralProps.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ public class GeneralProps {
1717
@Setting(value = "redis-bungee")
1818
private boolean redisBungee;
1919

20-
@Setting(value = "fallback-principal")
21-
private boolean fallbackPrincipal;
22-
2320
@Setting
2421
private String version;
2522

@@ -55,14 +52,6 @@ public void setRedisBungee(boolean redisBungee) {
5552
this.redisBungee = redisBungee;
5653
}
5754

58-
public boolean isFallbackPrincipal() {
59-
return fallbackPrincipal;
60-
}
61-
62-
public void setFallbackPrincipal(boolean fallbackPrincipal) {
63-
this.fallbackPrincipal = fallbackPrincipal;
64-
}
65-
6655
public String getVersion() {
6756
return version;
6857
}
@@ -78,7 +67,6 @@ public String toString() {
7867
", silent=" + silent +
7968
", autoReload=" + autoReload +
8069
", redisBungee=" + redisBungee +
81-
", fallbackPrincipal=" + fallbackPrincipal +
8270
", version='" + version + '\'' +
8371
'}';
8472
}

src/main/java/com/jaimemartz/playerbalancer/settings/props/features/BalancerProps.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ public class BalancerProps {
1212
@Setting(value = "principal-section")
1313
private String principalSectionName;
1414

15+
@Setting(value = "default-principal")
16+
private boolean defaultPrincipal;
17+
1518
@Setting(value = "dummy-sections")
1619
private List<String> dummySectionNames;
1720

@@ -64,6 +67,14 @@ public void setShowPlayers(boolean showPlayers) {
6467
this.showPlayers = showPlayers;
6568
}
6669

70+
public boolean isDefaultPrincipal() {
71+
return defaultPrincipal;
72+
}
73+
74+
public void setDefaultPrincipal(boolean defaultPrincipal) {
75+
this.defaultPrincipal = defaultPrincipal;
76+
}
77+
6778
@Override
6879
public String toString() {
6980
return "BalancerProps{" +

0 commit comments

Comments
 (0)