From 56f1dd2efb7a89f445bd7d8378b51a1daadd94ca Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Tue, 5 Sep 2017 18:20:56 +1200 Subject: [PATCH] Reverted change, didn't work. #story[1246] --- .../java/seng302/gameServer/ServerToClientThread.java | 4 ++-- .../seng302/gameServer/server/ChatCommandsTest.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java index 73c731e7..2b447cf1 100644 --- a/src/main/java/seng302/gameServer/ServerToClientThread.java +++ b/src/main/java/seng302/gameServer/ServerToClientThread.java @@ -388,7 +388,7 @@ public class ServerToClientThread implements Runnable, Observer { String[] words = chatterText.split("\\s+"); if (words.length > 2 && isHost) { switch (words[2].trim()) { - case "/speed": + case ">speed": try { GameState.setSpeedMultiplier(Double.valueOf(words[3])); GameState.broadcastChatter(new ChatterMessage( @@ -399,7 +399,7 @@ public class ServerToClientThread implements Runnable, Observer { logger.error("cannot parse >speed value"); } return; - case "/finish": + case ">finish": GameState.broadcastChatter(new ChatterMessage( chatterPayload[1], "SERVER: Game will now finish" diff --git a/src/test/java/seng302/gameServer/server/ChatCommandsTest.java b/src/test/java/seng302/gameServer/server/ChatCommandsTest.java index 51d766b1..16e51f2c 100644 --- a/src/test/java/seng302/gameServer/server/ChatCommandsTest.java +++ b/src/test/java/seng302/gameServer/server/ChatCommandsTest.java @@ -65,7 +65,7 @@ public class ChatCommandsTest { } catch (InterruptedException ie) { ie.printStackTrace(); } - host.sendChatterMessage("[time_prefix] /finish"); + host.sendChatterMessage("[time_prefix] >finish"); dcSent = true; try { Thread.sleep(2000); @@ -101,7 +101,7 @@ public class ChatCommandsTest { ie.printStackTrace(); } mst.startGame(); - host.sendChatterMessage("[time_prefix] /speed 5.0"); + host.sendChatterMessage("[time_prefix] >speed 5.0"); try { Thread.sleep(100); } catch (InterruptedException ie) { @@ -142,7 +142,7 @@ public class ChatCommandsTest { ie.printStackTrace(); } mst.startGame(); - host.sendChatterMessage("[time_prefix] /speed fdgdgdfg"); + host.sendChatterMessage("[time_prefix] >speed fdgdgdfg"); try { Thread.sleep(100); } catch (InterruptedException ie) { @@ -190,7 +190,7 @@ public class ChatCommandsTest { } catch (InterruptedException ie) { ie.printStackTrace(); } - client.sendChatterMessage("[time_prefix] /speed 5.0"); + client.sendChatterMessage("[time_prefix] >speed 5.0"); try { Thread.sleep(200); } catch (InterruptedException ie) { @@ -264,7 +264,7 @@ public class ChatCommandsTest { // } catch (InterruptedException ie) { // ie.printStackTrace(); // } - host.sendChatterMessage("[time_prefix] /finish"); + host.sendChatterMessage("[time_prefix] >finish"); dcSent = true; // try { // Thread.sleep(200);