Fascinated/McGamerZone
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Probs made a fix so players won't stuck in a lobby anymore, when all lobbies are restarting.

Browse Source
This commit is contained in:
Joel 2021-02-20 03:29:58 +01:00
parent 0e28612fec
commit 7eb8b8c614
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proxy/src/main/java/zone/themcgamer/proxy/hub/HubBalancer.java
View File

@ -11,6 +11,7 @@ import net.md_5.bungee.event.EventHandler;
import net.md_5.bungee.event.EventPriority; import net.md_5.bungee.event.EventPriority;
import zone.themcgamer.common.Tuple; import zone.themcgamer.common.Tuple;
import zone.themcgamer.data.jedis.command.JedisCommandHandler; import zone.themcgamer.data.jedis.command.JedisCommandHandler;
import zone.themcgamer.data.jedis.command.impl.ServerRestartCommand;
import zone.themcgamer.data.jedis.command.impl.ServerStateChangeCommand; import zone.themcgamer.data.jedis.command.impl.ServerStateChangeCommand;
import zone.themcgamer.data.jedis.data.ServerGroup; import zone.themcgamer.data.jedis.data.ServerGroup;
import zone.themcgamer.data.jedis.data.server.MinecraftServer; import zone.themcgamer.data.jedis.data.server.MinecraftServer;
@ -46,6 +47,20 @@ public class HubBalancer implements Runnable, Listener {
proxy.getProxy().getPluginManager().registerListener(proxy, this); proxy.getProxy().getPluginManager().registerListener(proxy, this);
JedisCommandHandler.getInstance().addListener(jedisCommand -> { JedisCommandHandler.getInstance().addListener(jedisCommand -> {
if (jedisCommand instanceof ServerRestartCommand) {
ServerRestartCommand serverRestartCommand = (ServerRestartCommand) jedisCommand;
ServerInfo serverInfo = proxy.getProxy().getServerInfo(serverRestartCommand.getServerId());
if (serverInfo == null)
return;
for (ProxiedPlayer player : proxy.getProxy().getPlayers()) {
if (player.getServer().getInfo().equals(serverInfo)) {
if (hubs.isEmpty() || hubs.size() == 1)
kickPlayer(player, NO_AVAILABLE_HUB);
}
}
if (hubs.containsValue(serverInfo))
hubs.remove(serverRestartCommand.getServerId());
}
if (jedisCommand instanceof ServerStateChangeCommand) { if (jedisCommand instanceof ServerStateChangeCommand) {
ServerStateChangeCommand serverStateChangeCommand = (ServerStateChangeCommand) jedisCommand; ServerStateChangeCommand serverStateChangeCommand = (ServerStateChangeCommand) jedisCommand;
System.out.println("Received update status from server " + serverStateChangeCommand.getServer().getId() + " status: " + serverStateChangeCommand.getNewState()); System.out.println("Received update status from server " + serverStateChangeCommand.getServer().getId() + " status: " + serverStateChangeCommand.getNewState());