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

New attempt to disconnect players when lobbies restarts...

Browse Source
This commit is contained in:
Joel 2021-03-17 23:33:10 +01:00
parent 9a69ada2a3
commit 3640b6ca98
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,23 +50,6 @@ public class HubBalancer implements Runnable, Listener {
if (jedisCommand instanceof ServerRestartCommand) { if (jedisCommand instanceof ServerRestartCommand) {
ServerRestartCommand serverRestartCommand = (ServerRestartCommand) jedisCommand; ServerRestartCommand serverRestartCommand = (ServerRestartCommand) jedisCommand;
removeServer(serverRestartCommand.getServerId()); 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;
@ -233,6 +216,15 @@ public class HubBalancer implements Runnable, Listener {
if (entry.getValue().getMotd().equals("STATIC")) if (entry.getValue().getMotd().equals("STATIC"))
return false; return false;
hubs.remove(serverId); hubs.remove(serverId);
if (hubs.size() <= 0) {
System.out.println(hubs.size());
System.out.println("Kicking players from server" + entry.getValue().getName());
entry.getValue().getPlayers().forEach(proxiedPlayer -> kickPlayer(proxiedPlayer, NO_AVAILABLE_HUB));
} else {
System.out.println(hubs.size());
System.out.println("Movings players from server " + entry.getValue().getName());
entry.getValue().getPlayers().forEach(this::sendToHub);
}
return true; return true;
}); });
} }