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

Merge remote-tracking branch 'origin/develop' into Story62_Swtich_To_RaceView_When_Race_Start

Browse Source 
# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
This commit is contained in:
Zhi You Tan
2017-07-21 16:35:04 +12:00
parent e891ed8a64 e8c2cf809b
commit 797a99f632
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+3 -6
View File
@@ -1,12 +1,9 @@
package seng302.gameServer; package seng302.gameServer;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import seng302.models.Player; import seng302.models.Player;
import java.util.ArrayList;
import seng302.models.Yacht; import seng302.models.Yacht;
import seng302.server.messages.BoatActionType; import seng302.server.messages.BoatActionType;
@@ -29,11 +26,11 @@ public class GameState {
public GameState(String hostIpAddress) { public GameState(String hostIpAddress) {
GameState.hostIpAddress = hostIpAddress; GameState.hostIpAddress = hostIpAddress;
players = new ArrayList<>(); players = new ArrayList<>();
yachts = new HashMap<>();
currentStage = GameStages.LOBBYING; currentStage = GameStages.LOBBYING;
isRaceStarted = false; isRaceStarted = false;
//set this when game stage changes to prerace //set this when game stage changes to prerace
previousUpdateTime = System.currentTimeMillis(); previousUpdateTime = System.currentTimeMillis();
yachts = new HashMap<>();
} }
public static String getHostIpAddress() { public static String getHostIpAddress() {