Skip to content

Commit 9c448b8

Browse files
committed
Remove support for RedisBungee
1 parent 2d2a7d8 commit 9c448b8

File tree

10 files changed

+5
-50
lines changed

10 files changed

+5
-50
lines changed

balancer/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@
6666
<type>jar</type>
6767
<scope>provided</scope>
6868
</dependency>
69-
<dependency>
70-
<groupId>com.imaginarycode.minecraft</groupId>
71-
<artifactId>RedisBungee</artifactId>
72-
<version>0.3.8-SNAPSHOT</version>
73-
<scope>provided</scope>
74-
</dependency>
7569
<dependency>
7670
<groupId>ninja.leaping.configurate</groupId>
7771
<artifactId>configurate-hocon</artifactId>

balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.jaimemartz.playerbalancer.commands.MainCommand;
66
import com.jaimemartz.playerbalancer.commands.ManageCommand;
77
import com.jaimemartz.playerbalancer.connection.ServerAssignRegistry;
8-
import com.jaimemartz.playerbalancer.helper.NetworkManager;
98
import com.jaimemartz.playerbalancer.helper.PasteHelper;
109
import com.jaimemartz.playerbalancer.helper.PlayerLocker;
1110
import com.jaimemartz.playerbalancer.listeners.*;
@@ -34,7 +33,6 @@ public class PlayerBalancer extends Plugin {
3433
private StatusManager statusManager;
3534
private SettingsHolder settings;
3635
private SectionManager sectionManager;
37-
private NetworkManager networkManager;
3836
private ConfigurationLoader<CommentedConfigurationNode> loader;
3937

4038
private FallbackCommand fallbackCommand;
@@ -128,8 +126,6 @@ private void execStart() {
128126
getProxy().getPluginManager().registerListener(this, reloadListener);
129127
}
130128

131-
networkManager = new NetworkManager(this);
132-
133129
sectionManager = new SectionManager(this);
134130
sectionManager.load();
135131

@@ -284,10 +280,6 @@ public StatusManager getStatusManager() {
284280
return statusManager;
285281
}
286282

287-
public NetworkManager getNetworkManager() {
288-
return networkManager;
289-
}
290-
291283
public FallbackCommand getFallbackCommand() {
292284
return fallbackCommand;
293285
}

balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveFillerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, Li
1717

1818
for (ServerInfo server : servers) {
1919
ServerStatus status = plugin.getStatusManager().getStatus(server);
20-
int count = plugin.getNetworkManager().getPlayers(server);
20+
int count = server.getPlayers().size();
2121

2222
if (count > max && count <= status.getMaximum()) {
2323
max = count;

balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveLowestProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, Li
1515
ServerInfo target = null;
1616

1717
for (ServerInfo server : servers) {
18-
int count = plugin.getNetworkManager().getPlayers(server);
18+
int count = server.getPlayers().size();
1919

2020
if (count < min) {
2121
min = count;

balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ProgressiveProvider extends AbstractProvider {
1414
public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
1515
for (ServerInfo server : servers) {
1616
ServerStatus status = plugin.getStatusManager().getStatus(server);
17-
if (plugin.getNetworkManager().getPlayers(server) < status.getMaximum()) {
17+
if (server.getPlayers().size() < status.getMaximum()) {
1818
return server;
1919
}
2020
}

balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomFillerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, Li
1818
int max = Integer.MIN_VALUE;
1919

2020
for (ServerInfo server : servers) {
21-
int count = plugin.getNetworkManager().getPlayers(server);
21+
int count = server.getPlayers().size();
2222

2323
if (count >= max) {
2424
if (count > max) {

balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomLowestProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, Li
1818
int min = Integer.MAX_VALUE;
1919

2020
for (ServerInfo server : servers) {
21-
int count = plugin.getNetworkManager().getPlayers(server);
21+
int count = server.getPlayers().size();
2222

2323
if (count <= min) {
2424
if (count < min) {

balancer/src/main/java/com/jaimemartz/playerbalancer/helper/NetworkManager.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ public class GeneralProps {
1616
@Setting(value = "auto-reload")
1717
private boolean autoReload;
1818

19-
@Setting(value = "redis-bungee")
20-
private boolean redisBungee;
21-
2219
@Setting(value = "plugin-messaging")
2320
private boolean pluginMessaging;
2421

balancer/src/main/resources/default.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ general {
1111
# When true, the plugin will reload when you execute /greload
1212
auto-reload=true
1313

14-
# When true, the plugin will get player counts from RedisBungee
15-
redis-bungee=false
16-
1714
# When true, this plugin will print less messages when loading
1815
silent=false
1916

0 commit comments

Comments
 (0)