michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failing tests & other bug fixes

Browse Source 
- Fixed server capacity in server list
- Fixed failing unit tests for chat

Tags: #story[1281] #pair[mra106, cir27]
This commit is contained in:
Michael Rausch
2017-09-27 20:37:29 +13:00
parent 2b3a972ed5
commit 5cc4898ab5
12 changed files with 390 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+9 -2
View File
@@ -1,5 +1,6 @@
package seng302.gameServer;
import java.io.IOException;
import java.util.*;
import javafx.scene.paint.Color;
@@ -81,7 +82,7 @@ public class GameState implements Runnable {
private static MarkOrder markOrder;
private static long startTime;
private static Set<Mark> marks = new HashSet<>();
private static List<Limit> courseLimit;
private static List<Limit> courseLimit = new ArrayList<>();
private static Integer maxPlayers = 8;
private static List<Token> tokensInPlay;
@@ -97,7 +98,6 @@ public class GameState implements Runnable {
windSpeed = 10000d;
yachts = new HashMap<>();
tokensInPlay = new ArrayList<>();
marks = new HashSet<>();
players = new ArrayList<>();
customizationFlag = false;
playerHasLeftFlag = false;
@@ -517,6 +517,7 @@ public class GameState implements Runnable {
return true;
}
}
if (GeoUtility.checkCrossedLine(courseLimit.get(courseLimit.size() - 1), courseLimit.get(0),
yacht.getLastLocation(), yacht.getLocation()) != 0) {
return true;
@@ -1025,6 +1026,12 @@ public class GameState implements Runnable {
public static void setMaxPlayers(Integer newMax){
maxPlayers = newMax;
try {
ServerAdvertiser.getInstance().setCapacity(newMax);
} catch (IOException e) {
logger.warn("Couldn't update max players");
}
}
public static void endRace () {