Yandrik/Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix: fixed bug where sending reoconnect while not able to do so breaks the server

Browse Source
This commit is contained in:
Yannik Bretschneider 2021-06-07 17:26:59 +02:00
parent 8d26c3f2ea
commit 3c49c5bbd8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Server/src/main/java/uulm/teamname/marvelous/server/netconnector/ClientState.java
View File

@ -4,5 +4,5 @@ public enum ClientState {
Blank, Blank,
Ready, Ready,
Assigned, Assigned,
Playing Reconnect, Playing
} }

16
Server/src/main/java/uulm/teamname/marvelous/server/netconnector/UserManager.java
View File

@ -152,7 +152,13 @@ public class UserManager {
Logger.trace("forwarding message to the LobbyManager"); Logger.trace("forwarding message to the LobbyManager");
AtomicBoolean running = new AtomicBoolean(false); AtomicBoolean running = new AtomicBoolean(false);
if(LobbyManager.getInstance().handleConnect(client, running)) { if(LobbyManager.getInstance().handleConnect(client, running)) {
client.state = ClientState.Ready;
var clientHasRunningGame = running.get();
if (clientHasRunningGame) {
client.state = ClientState.Reconnect;
} else {
client.state = ClientState.Ready;
}
HelloClientMessage response = new HelloClientMessage(); HelloClientMessage response = new HelloClientMessage();
response.runningGame = running.get(); response.runningGame = running.get();
@ -164,8 +170,8 @@ public class UserManager {
/** Handles a reconnectMessage, and reconnects the client if needed */ /** Handles a reconnectMessage, and reconnects the client if needed */
private void handleReconnectMessage(Client client, ReconnectMessage message) { private void handleReconnectMessage(Client client, ReconnectMessage message) {
if(client.state != ClientState.Ready) { if(client.state != ClientState.Reconnect) {
client.sendError("Invalid message."); client.sendError("Invalid message, as client is not in reconnect-ready state");
return; return;
} }
@ -179,8 +185,8 @@ public class UserManager {
client.sendError("You could not be reconnected to the Lobby"); client.sendError("You could not be reconnected to the Lobby");
} }
} else { } else {
Logger.trace("No reconnect requested, changing ClientState to blank"); Logger.trace("No reconnect requested, setting client to ready to connect state");
client.state = ClientState.Blank; client.state = ClientState.Ready;
} }
} }