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

Merge and tests fix

Browse Source
This commit is contained in:
Kusal Ekanayake
2017-08-14 13:35:18 +12:00
parent 2e892f35ea
commit 9c1fe72f6b
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/steps/ToggleSailSteps.java
+2 -8
View File
@@ -7,13 +7,11 @@ import org.junit.Assert;
import seng302.gameServer.GameStages; 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.BoatAction;
import seng302.gameServer.server.messages.BoatActionType;
import seng302.model.Yacht; import seng302.model.Yacht;
import seng302.visualiser.ClientToServerThread; import seng302.visualiser.ClientToServerThread;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
/** /**
* Created by kre39 on 7/08/17. * Created by kre39 on 7/08/17.
@@ -44,11 +42,7 @@ public class ToggleSailSteps {
public void the_user_has_pressed(String arg1) throws Throwable { public void the_user_has_pressed(String arg1) throws Throwable {
startTime = System.currentTimeMillis(); startTime = System.currentTimeMillis();
if (arg1 == "shift") { if (arg1 == "shift") {
if (sailsIn) { client.sendBoatAction(BoatAction.SAILS_IN);
client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_OUT));
} else {
client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_IN));
}
} }
} }