From b3320ad8055b18d9b0f6f0816f3c1d837a61b5f9 Mon Sep 17 00:00:00 2001 From: Haoming Yin Date: Thu, 14 Sep 2017 14:49:25 +1200 Subject: [PATCH] Fixed server message sender tags: #story[1246] --- .../java/seng302/gameServer/GameState.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java index 961eb415..8ef8020b 100644 --- a/src/main/java/seng302/gameServer/GameState.java +++ b/src/main/java/seng302/gameServer/GameState.java @@ -792,28 +792,40 @@ public class GameState implements Runnable { } + public static void sendServerMessage(Integer messageType, String message) { + notifyMessageListeners(new ChatterMessage( + messageType, "SERVER: " + message + )); + } + public static void processChatter(ChatterMessage chatterMessage, boolean isHost) { String chatterText = chatterMessage.getMessage(); String[] words = chatterText.split("\\s+"); if (words.length > 2 && isHost) { switch (words[2].trim()) { - case ">speed": + case "/speed": try { setSpeedMultiplier(Double.valueOf(words[3])); - notifyMessageListeners(new ChatterMessage( - chatterMessage.getMessage_type(), - "SERVER: Speed modifier set to x" + words[3] - )); + sendServerMessage(chatterMessage.getMessage_type(), + "SERVER: Speed modifier set to x" + words[3]); + System.out.println(chatterMessage.getMessage_type()); +// notifyMessageListeners(new ChatterMessage( +// chatterMessage.getMessage_type(), +// "SERVER: Speed modifier set to x" + words[3] +// )); } catch (Exception e) { Logger logger = LoggerFactory.getLogger(GameState.class); logger.error("cannot parse >speed value"); } return; - case ">finish": - notifyMessageListeners(new ChatterMessage( - chatterMessage.getMessage_type(), - "SERVER: Game will now finish" - )); + case "/finish": + sendServerMessage(chatterMessage.getMessage_type(), + "SERVER: Game will now finish"); + System.out.println(chatterMessage.getMessage_type()); +// notifyMessageListeners(new ChatterMessage( +// chatterMessage.getMessage_type(), +// "SERVER: Game will now finish" +// )); endRace(); return; }