From 0c956f93c8aa39b578e5af68c67d7df277587d94 Mon Sep 17 00:00:00 2001 From: William Muir Date: Sat, 9 Sep 2017 12:37:31 +1200 Subject: [PATCH] Merge request fixes. minor refactor #story[1246] --- src/main/java/seng302/gameServer/GameState.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java index 64197f1d..86193c57 100644 --- a/src/main/java/seng302/gameServer/GameState.java +++ b/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;