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

WIP: Marks randomly appear in course now. Mark arrows broken.

Browse Source 
Something about sending raceXML during the course of the race breaks the mark rounding arrows functionallity, crashing the game.

#story[1250]
This commit is contained in:
William Muir
2017-08-29 19:13:48 +12:00
parent dc19310849
commit 201405d070
4 changed files with 80 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+4 -10
View File
@@ -98,16 +98,6 @@ public class GameState implements Runnable {
yachts = new HashMap<>();
tokens = new ArrayList<>();
//TEMP TEST STUFF
// TODO: 29/08/17 wmu16 - Take this out!
tokens.add(new Token(TokenType.BOOST, 57.66946, 11.83154));
tokens.add(new Token(TokenType.BOOST, 57.66877, 11.83382));
tokens.add(new Token(TokenType.BOOST, 57.66914, 11.83965));
tokens.add(new Token(TokenType.BOOST, 57.66684, 11.83214));
;
//TEMP TEST STUFF
players = new ArrayList<>();
GameState.hostIpAddress = hostIpAddress;
customizationFlag = false;
@@ -162,6 +152,10 @@ public class GameState implements Runnable {
return tokens;
}
public static void clearTokens() {
tokens.clear();
}
public static void addPlayer(Player player) {
players.add(player);
String playerText = player.getYacht().getSourceId() + " " + player.getYacht().getBoatName()