From e8c2cf809b0d74f5f0a79abcee409f8f736a13b7 Mon Sep 17 00:00:00 2001
From: Michael Rausch <mra106@uclive.ac.nz>
Date: Fri, 21 Jul 2017 15:42:20 +1200
Subject: [PATCH] Fixed Null Ptr Exception in GameState

---
 src/main/java/seng302/gameServer/GameState.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index 20aaaf4f..4694d7d4 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -1,11 +1,9 @@
 package seng302.gameServer;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+
 import seng302.models.Player;
 
-import java.util.ArrayList;
 import seng302.models.Yacht;
 import seng302.server.messages.BoatActionType;
 
@@ -32,6 +30,7 @@ public class GameState {
         isRaceStarted = false;
         //set this when game stage changes to prerace
         previousUpdateTime = System.currentTimeMillis();
+        yachts = new HashMap<>();
     }
 
     public static String getHostIpAddress() {