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

Merge branch 'master' of https://github.com/McGamerZone/McGamerCore

Browse Source
This commit is contained in:
nickreesdev 2021-02-19 22:12:29 -06:00
commit 35736ed02d
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
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,27 @@ 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;
removeServer(serverRestartCommand.getServerId());
ServerInfo serverInfo = proxy.getProxy().getServerInfo(serverRestartCommand.getServerId());
if (serverInfo == null) {
System.out.println("ServerInfo is null");
//We do this check due sometimes players stay in a server which is deleted. But were send to it before it was deleted.
for (ProxiedPlayer player : proxy.getProxy().getPlayers()) {
if (player.getServer() == null && (hubs.size() == 0))
kickPlayer(player, NO_AVAILABLE_HUB);
}
return;
} else {
for (ProxiedPlayer player : proxy.getProxy().getPlayers()) {
if (player.getServer().getInfo().equals(serverInfo)) {
if (hubs.isEmpty())
kickPlayer(player, NO_AVAILABLE_HUB);
}
}
}
}
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());
@ -54,17 +76,7 @@ public class HubBalancer implements Runnable, Listener {
if (!serverStateChangeCommand.getNewState().isShuttingDownState()) if (!serverStateChangeCommand.getNewState().isShuttingDownState())
return; return;
MinecraftServer server = serverStateChangeCommand.getServer(); MinecraftServer server = serverStateChangeCommand.getServer();
proxy.getProxy().getServers().entrySet().removeIf(entry -> { removeServer(server.getId());
String key = entry.getKey();
if (!key.equals(server.getId()))
return false;
if (key.equals(group.getName()))
return false;
if (entry.getValue().getMotd().equals("STATIC"))
return false;
hubs.remove(server.getId());
return true;
});
} }
}); });
} }
@ -89,7 +101,7 @@ public class HubBalancer implements Runnable, Listener {
kickPlayer(player, HUB_SEND_FAILED); kickPlayer(player, HUB_SEND_FAILED);
event.setCancelled(true); event.setCancelled(true);
} else event.setTarget(serverInfo); } else event.setTarget(serverInfo);
} else if (reason == ServerConnectEvent.Reason.LOBBY_FALLBACK) { } else if (reason == ServerConnectEvent.Reason.LOBBY_FALLBACK || (event.getTarget().isRestricted())) {
kickPlayer(player, NO_AVAILABLE_HUB); kickPlayer(player, NO_AVAILABLE_HUB);
event.setCancelled(true); event.setCancelled(true);
} }
@ -210,4 +222,18 @@ public class HubBalancer implements Runnable, Listener {
"&b" + reason + "\n" + "&b" + reason + "\n" +
"&7"))); "&7")));
} }
private void removeServer(String serverId) {
proxy.getProxy().getServers().entrySet().removeIf(entry -> {
String key = entry.getKey();
if (!key.equals(serverId))
return false;
if (key.equals(group.getName()))
return false;
if (entry.getValue().getMotd().equals("STATIC"))
return false;
hubs.remove(serverId);
return true;
});
}
} }