Fixed some merge issues.

2017-08-10 13:16:53 +12:00
parent 805c12bf41
commit 130ffcbf07
2 changed files with 2 additions and 2 deletions
@@ -72,7 +72,7 @@ public class ControllerServer extends Observable implements Runnable {
                    try {
                        boatActionDecoder.decode(encodedMessage.getMessageBody());
                        BoatAction boatAction = boatActionDecoder.getMessage();
-                        action = boatActionDecoder.getBoatAction();
+                        action = boatAction.getBoatAction();

                        // Notify observers of most recent action
                        this.notifyObservers();