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 fix

Browse Source
This commit is contained in:
Kusal Ekanayake
2017-08-14 13:20:15 +12:00
parent e65558b8ac
commit 4dc6b2af2b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameClient.java
+1 -1
View File
@@ -305,10 +305,10 @@ public class GameClient {
case X: // zoom out case X: // zoom out
raceView.getGameView().zoomOut(); raceView.getGameView().zoomOut();
break; break;
}
} }
} }
private void keyReleased(KeyEvent e) { private void keyReleased(KeyEvent e) {
switch (e.getCode()) { switch (e.getCode()) {
//TODO 12/07/17 Determine the sail state and send the appropriate packet (eg. if sails are in, send a sail out packet) //TODO 12/07/17 Determine the sail state and send the appropriate packet (eg. if sails are in, send a sail out packet)
src/test/java/steps/ToggleSailSteps.java
+2 -3
View File
@@ -8,7 +8,6 @@ import seng302.gameServer.GameStages;
import seng302.gameServer.GameState; import seng302.gameServer.GameState;
import seng302.gameServer.MainServerThread; import seng302.gameServer.MainServerThread;
import seng302.gameServer.server.messages.BoatActionMessage; import seng302.gameServer.server.messages.BoatActionMessage;
import seng302.gameServer.server.messages.BoatActionType;
import seng302.model.Yacht; import seng302.model.Yacht;
import seng302.visualiser.ClientToServerThread; import seng302.visualiser.ClientToServerThread;
@@ -41,9 +40,9 @@ public class ToggleSailSteps {
startTime = System.currentTimeMillis(); startTime = System.currentTimeMillis();
if (arg1 == "shift") { if (arg1 == "shift") {
if (sailsIn) { if (sailsIn) {
client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_OUT)); // client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_OUT));
} else { } else {
client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_IN)); // client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_IN));
} }
} }
} }