diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java index df119e1b..f5e1abba 100644 --- a/src/main/java/seng302/gameServer/GameState.java +++ b/src/main/java/seng302/gameServer/GameState.java @@ -87,7 +87,7 @@ public class GameState implements Runnable { private static List allTokens; private static List tokensInPlay; - private static List markListeners; + private static List newMessageListeners; private static Map playerStringMap = new HashMap<>(); @@ -106,7 +106,7 @@ public class GameState implements Runnable { //set this when game stage changes to prerace previousUpdateTime = System.currentTimeMillis(); markOrder = new MarkOrder(); //This could be instantiated at some point with a select map? - markListeners = new ArrayList<>(); + newMessageListeners = new ArrayList<>(); allTokens = makeTokens(); resetStartTime(); @@ -744,8 +744,8 @@ public class GameState implements Runnable { } private static void notifyMessageListeners(Message message) { - for (NewMessageListener mpl : markListeners) { - mpl.notify(message); + for (NewMessageListener ml : newMessageListeners) { + ml.notify(message); } } @@ -787,7 +787,7 @@ public class GameState implements Runnable { } public static void addMessageEventListener(NewMessageListener listener) { - markListeners.add(listener); + newMessageListeners.add(listener); } public static void setCustomizationFlag() { diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java index 995bf1c2..965b9577 100644 --- a/src/main/java/seng302/gameServer/ServerToClientThread.java +++ b/src/main/java/seng302/gameServer/ServerToClientThread.java @@ -297,10 +297,6 @@ public class ServerToClientThread implements Runnable { return yacht; } - public void sendCollisionMessage(Integer yachtId) { - sendMessage(new YachtEventCodeMessage(yachtId)); - } - public void addConnectionListener(ConnectionListener listener) { connectionListeners.add(listener); }