seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a way to end a game, when its lobby is closed.

Browse Source
This commit is contained in:
Seraina 2022-04-16 21:34:36 +02:00
parent 4d82af32f4
commit 88f72d7612
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Game.java
View File

@ -24,6 +24,7 @@ public class Game implements Runnable {
protected boolean isDay = false; //false means it is night, it is night by default protected boolean isDay = false; //false means it is night, it is night by default
protected VoteHandler voteHandler = new VoteHandler(); protected VoteHandler voteHandler = new VoteHandler();
private Lobby lobby; private Lobby lobby;
private boolean isOngoing = true;
private String name; private String name;
private static int nameCounter = 0; private static int nameCounter = 0;
/** /**
@ -57,6 +58,10 @@ public class Game implements Runnable {
isDay = day; isDay = day;
} }
public void setOngoing(boolean ongoing) {
isOngoing = ongoing;
}
/** /**
* Starts a new game, creates a passenger array and saves it in gameState, sets the OG * Starts a new game, creates a passenger array and saves it in gameState, sets the OG
* currently at gameState.train[3] fills the passengerTrain moving from left to rigth in the * currently at gameState.train[3] fills the passengerTrain moving from left to rigth in the
@ -102,7 +107,7 @@ public class Game implements Runnable {
LOGGER.info(gameState.toString()); LOGGER.info(gameState.toString());
i = 0; i = 0;
while (true) { while (isOngoing == true) {
if (!isDay) { if (!isDay) {
LOGGER.info("NIGHT"); LOGGER.info("NIGHT");
gameOverCheck = voteHandler.ghostVote(gameState.getPassengerTrain(), this); gameOverCheck = voteHandler.ghostVote(gameState.getPassengerTrain(), this);

1
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Lobby.java
View File

@ -228,6 +228,7 @@ public class Lobby {
*/ */
public void closeLobby() { public void closeLobby() {
lobbies.remove(this); lobbies.remove(this);
game.setOngoing(false); // ends game
//ClientHandler.broadcastAnnouncementToAll("Lobby nr. " + this.getLobbyID() + " has been closed."); //ClientHandler.broadcastAnnouncementToAll("Lobby nr. " + this.getLobbyID() + " has been closed.");
/* /*