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

fix: resolve some more connection opening and closing issues

Browse Source
This commit is contained in:
punchready 2021-06-07 13:11:09 +02:00
parent 3be518f13b
commit 3ea1cc6cf5
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Server/src/main/java/uulm/teamname/marvelous/server/lobbymanager/LobbyConnection.java
View File

@ -14,8 +14,6 @@ import uulm.teamname.marvelous.server.lobby.Lobby;
import uulm.teamname.marvelous.server.netconnector.SUID; import uulm.teamname.marvelous.server.netconnector.SUID;
import uulm.teamname.marvelous.server.netconnector.UserManager; import uulm.teamname.marvelous.server.netconnector.UserManager;
import javax.management.MBeanParameterInfo;
import java.time.OffsetDateTime;
import java.util.*; import java.util.*;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
@ -54,6 +52,7 @@ public class LobbyConnection implements Runnable {
public void addParticipant(Participant participant) { public void addParticipant(Participant participant) {
if(participant.type == ParticipantType.Spectator) { if(participant.type == ParticipantType.Spectator) {
spectators.add(participant); spectators.add(participant);
return;
} }
if(participant.type == ParticipantType.PlayerOne) { if(participant.type == ParticipantType.PlayerOne) {
@ -68,6 +67,7 @@ public class LobbyConnection implements Runnable {
} }
public void removeParticipant(Participant participant, String reason) { public void removeParticipant(Participant participant, String reason) {
LobbyManager.getInstance().removeParticipant(participant);
UserManager.getInstance().removeClient(participant.getClient(), reason); UserManager.getInstance().removeClient(participant.getClient(), reason);
if(participant.type == ParticipantType.Spectator) { if(participant.type == ParticipantType.Spectator) {

4
Server/src/main/java/uulm/teamname/marvelous/server/lobbymanager/LobbyManager.java
View File

@ -159,6 +159,10 @@ public class LobbyManager {
} }
public void removeParticipant(Participant participant) {
participants.remove(participant.id);
}
private void addParticipant(Client client, String lobbyID, RoleEnum role) { private void addParticipant(Client client, String lobbyID, RoleEnum role) {
if(!lobbies.containsKey(lobbyID)) { if(!lobbies.containsKey(lobbyID)) {
if(!LobbyRunner.getInstance().canAddLobby()) { if(!LobbyRunner.getInstance().canAddLobby()) {

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

@ -1,7 +1,6 @@
package uulm.teamname.marvelous.server.netconnector; package uulm.teamname.marvelous.server.netconnector;
import org.java_websocket.framing.CloseFrame; import org.java_websocket.framing.CloseFrame;
import org.tinylog.Logger;
import uulm.teamname.marvelous.gamelibrary.json.JSON; import uulm.teamname.marvelous.gamelibrary.json.JSON;
import uulm.teamname.marvelous.gamelibrary.json.ValidationUtility; import uulm.teamname.marvelous.gamelibrary.json.ValidationUtility;
import uulm.teamname.marvelous.gamelibrary.messages.BasicMessage; import uulm.teamname.marvelous.gamelibrary.messages.BasicMessage;