michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Calum
2017-09-09 13:04:00 +12:00
parent faefcc7938 0c956f93c8
commit 875a6b4e98
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+3 -7
View File
@@ -685,7 +685,7 @@ public class GameState implements Runnable {
case ">speed": case ">speed":
try { try {
setSpeedMultiplier(Double.valueOf(words[3])); setSpeedMultiplier(Double.valueOf(words[3]));
broadcastChatter(new ChatterMessage( notifyMessageListeners(new ChatterMessage(
chatterMessage.getMessage_type(), chatterMessage.getMessage_type(),
"SERVER: Speed modifier set to x" + words[3] "SERVER: Speed modifier set to x" + words[3]
)); ));
@@ -695,7 +695,7 @@ public class GameState implements Runnable {
} }
return; return;
case ">finish": case ">finish":
broadcastChatter(new ChatterMessage( notifyMessageListeners(new ChatterMessage(
chatterMessage.getMessage_type(), chatterMessage.getMessage_type(),
"SERVER: Game will now finish" "SERVER: Game will now finish"
)); ));
@@ -703,7 +703,7 @@ public class GameState implements Runnable {
return; return;
} }
} }
broadcastChatter(chatterMessage); notifyMessageListeners(chatterMessage);
} }
@@ -723,10 +723,6 @@ public class GameState implements Runnable {
customizationFlag = false; customizationFlag = false;
} }
public static void broadcastChatter(ChatterMessage chatterMessage) {
notifyMessageListeners(chatterMessage);
}
public static void endRace () { public static void endRace () {
yachts.forEach((id, yacht) -> yacht.setBoatStatus(BoatStatus.FINISHED)); yachts.forEach((id, yacht) -> yacht.setBoatStatus(BoatStatus.FINISHED));
currentStage = GameStages.FINISHED; currentStage = GameStages.FINISHED;