Merge remote-tracking branch 'origin/Story1249_SoundsAndMusic' into Story1249_SoundsAndMusic

src/main/java/seng302/gameServer/GameState.java

@@ -685,7 +685,7 @@ public class GameState implements Runnable {
                 case ">speed":
                     try {
                         setSpeedMultiplier(Double.valueOf(words[3]));
-                        broadcastChatter(new ChatterMessage(
+                        notifyMessageListeners(new ChatterMessage(
                             chatterMessage.getMessage_type(),
                             "SERVER: Speed modifier set to x" + words[3]
                         ));
@@ -695,7 +695,7 @@ public class GameState implements Runnable {
                     }
                     return;
                 case ">finish":
-                    broadcastChatter(new ChatterMessage(
+                    notifyMessageListeners(new ChatterMessage(
                         chatterMessage.getMessage_type(),
                         "SERVER: Game will now finish"
                     ));
@@ -703,7 +703,7 @@ public class GameState implements Runnable {
                     return;
             }
         }
-        broadcastChatter(chatterMessage);
+        notifyMessageListeners(chatterMessage);
     }
 
 
@@ -723,10 +723,6 @@ public class GameState implements Runnable {
         customizationFlag = false;
     }
 
-    public static void broadcastChatter(ChatterMessage chatterMessage) {
-        notifyMessageListeners(chatterMessage);
-    }
-
     public static void endRace () {
         yachts.forEach((id, yacht) -> yacht.setBoatStatus(BoatStatus.FINISHED));
         currentStage = GameStages.FINISHED;