From 8b543488e33608944ee3d42b4538563a98ba835b Mon Sep 17 00:00:00 2001 From: Alistair McIntyre Date: Mon, 14 Aug 2017 14:15:34 +1200 Subject: [PATCH] Fixed faulty develop merge and completed manual testing before merging back into develop. tags: #story[1111] --- src/main/java/seng302/visualiser/GameClient.java | 4 +++- src/test/java/steps/ToggleSailSteps.java | 11 ++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java index 613fb521..028ea1e3 100644 --- a/src/main/java/seng302/visualiser/GameClient.java +++ b/src/main/java/seng302/visualiser/GameClient.java @@ -312,7 +312,9 @@ public class GameClient { 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) case SHIFT: // sails in/sails out - socketThread.sendBoatAction(BoatAction.SAILS_IN); break; + socketThread.sendBoatAction(BoatAction.SAILS_IN); + raceView.getGameView().getPlayerYacht().toggleClientSail(); + break; case PAGE_UP: case PAGE_DOWN: socketThread.sendBoatAction(BoatAction.MAINTAIN_HEADING); break; diff --git a/src/test/java/steps/ToggleSailSteps.java b/src/test/java/steps/ToggleSailSteps.java index 2347c9ce..4e3a849f 100644 --- a/src/test/java/steps/ToggleSailSteps.java +++ b/src/test/java/steps/ToggleSailSteps.java @@ -3,18 +3,15 @@ package steps; import cucumber.api.java.en.Given; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; +import java.util.ArrayList; import org.junit.Assert; import seng302.gameServer.GameStages; import seng302.gameServer.GameState; import seng302.gameServer.MainServerThread; -import seng302.gameServer.server.messages.BoatActionMessage; -import seng302.gameServer.server.messages.BoatActionType; +import seng302.gameServer.server.messages.BoatAction; import seng302.model.Yacht; import seng302.visualiser.ClientToServerThread; -import java.util.ArrayList; -import java.util.Collections; - /** * Created by kre39 on 7/08/17. */ @@ -45,9 +42,9 @@ public class ToggleSailSteps { startTime = System.currentTimeMillis(); if (arg1 == "shift") { if (sailsIn) { - client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_OUT)); + client.sendBoatAction(BoatAction.SAILS_OUT); } else { - client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_IN)); + client.sendBoatAction(BoatAction.SAILS_IN); } } }