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 remote-tracking branch 'origin/Story64_SailsAnimations' into Story64_SailsAnimations

Browse Source 
# Conflicts:
#	src/test/java/steps/ToggleSailSteps.java
This commit is contained in:
Alistair McIntyre
2017-08-14 14:17:10 +12:00
parent 8b543488e3 9c1fe72f6b
commit 76dabb8138
3 changed files with 70 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/steps/ToggleSailSteps.java
+3 -5
View File
@@ -12,6 +12,8 @@ import seng302.gameServer.server.messages.BoatAction;
import seng302.model.Yacht;
import seng302.visualiser.ClientToServerThread;
import java.util.ArrayList;
/**
* Created by kre39 on 7/08/17.
*/
@@ -41,11 +43,7 @@ public class ToggleSailSteps {
public void the_user_has_pressed(String arg1) throws Throwable {
startTime = System.currentTimeMillis();
if (arg1 == "shift") {
if (sailsIn) {
client.sendBoatAction(BoatAction.SAILS_OUT);
} else {
client.sendBoatAction(BoatAction.SAILS_IN);
}
client.sendBoatAction(BoatAction.SAILS_IN);
}
}