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

fix: fixed a bug where spectators that join aren't in the playing state

Browse Source
This commit is contained in:
Yannik Bretschneider 2021-06-07 17:57:13 +02:00
parent 17eb44ce49
commit 2da32cb397
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/RequestGameStateSegment.java
View File

@ -2,7 +2,9 @@ package uulm.teamname.marvelous.server.lobby.pipelining;
import org.tinylog.Logger; import org.tinylog.Logger;
import uulm.teamname.marvelous.gamelibrary.events.Event; import uulm.teamname.marvelous.gamelibrary.events.Event;
import uulm.teamname.marvelous.gamelibrary.events.EventBuilder;
import uulm.teamname.marvelous.gamelibrary.gamelogic.GameInstance; import uulm.teamname.marvelous.gamelibrary.gamelogic.GameInstance;
import uulm.teamname.marvelous.gamelibrary.messages.server.EventMessage;
import uulm.teamname.marvelous.gamelibrary.requests.RequestBuilder; import uulm.teamname.marvelous.gamelibrary.requests.RequestBuilder;
import uulm.teamname.marvelous.gamelibrary.requests.RequestType; import uulm.teamname.marvelous.gamelibrary.requests.RequestType;
import uulm.teamname.marvelous.server.lobby.Lobby; import uulm.teamname.marvelous.server.lobby.Lobby;
@ -28,7 +30,10 @@ public class RequestGameStateSegment implements Segment {
Logger.trace("RequestGameStateSegment received {} requests", packet.size()); Logger.trace("RequestGameStateSegment received {} requests", packet.size());
if (packet.containsRequestOfType(RequestType.Req)) { if (packet.containsRequestOfType(RequestType.Req)) {
Logger.trace("Req event found. Returning Gamestate, and clearing entire RequestList"); Logger.trace("Req event found. Returning Gamestate, and clearing entire RequestList");
carrier.add(game.getGameStateEvent()); var gamestateEventMessage = new EventMessage();
gamestateEventMessage.messages = new Event[] {game.getGameStateEvent()};
packet.getOrigin().sendMessage(gamestateEventMessage);
carrier.clear();
packet.clear(); packet.clear();
} }
} }

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

@ -49,17 +49,18 @@ public class LobbyConnection implements Runnable {
} }
public void addParticipant(Participant participant) { public void addParticipant(Participant participant) {
if (this.state == LobbyConnectionState.Started) { if (this.state == LobbyConnectionState.Started || this.player1.state == ParticipantState.Playing) {
Logger.trace("Set client state to playing");
participant.getClient().state = ClientState.Playing; participant.getClient().state = ClientState.Playing;
participant.state = ParticipantState.Playing;
} }
if(participant.type == ParticipantType.Spectator) { if(participant.type == ParticipantType.Spectator) {
Logger.trace("Adding spectator");
spectators.add(participant); spectators.add(participant);
return; return;
} } else if(participant.type == ParticipantType.PlayerOne) {
if(participant.type == ParticipantType.PlayerOne) {
player1 = participant; player1 = participant;
}else { } else {
player2 = participant; player2 = participant;
} }
} }

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

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