From c98297ea7908164a5a5ecd593356d178c6e23e35 Mon Sep 17 00:00:00 2001 From: William Muir Date: Thu, 28 Sep 2017 14:44:16 +1300 Subject: [PATCH] Merged dev changes back on to mini map #story[1273] --- src/main/java/seng302/gameServer/GameState.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java index 8f7975fe..f5e2e2fd 100644 --- a/src/main/java/seng302/gameServer/GameState.java +++ b/src/main/java/seng302/gameServer/GameState.java @@ -238,7 +238,7 @@ public class GameState implements Runnable { if (System.currentTimeMillis() > startTime) { startSpawningTokens(); startUpdatingWind(); - GameState.setCurrentStage(GameStages.RACING); + GameState.currentStage = GameStages.RACING; } } if (currentStage == GameStages.RACING) { @@ -299,8 +299,8 @@ public class GameState implements Runnable { windSpeed += random.nextInt(500); } - GameState.setWindSpeed(Double.valueOf(windSpeed)); - GameState.setWindDirection(direction.doubleValue()); + GameState.windSpeed = Double.valueOf(windSpeed); + GameState.windDirection = direction.doubleValue(); }