From 130ffcbf077d64a68135d14105d19fadc30ac8a9 Mon Sep 17 00:00:00 2001 From: fjc40 Date: Thu, 10 Aug 2017 13:16:53 +1200 Subject: [PATCH] Fixed some merge issues. --- racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java | 2 +- .../main/java/visualiser/gameController/ControllerServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java b/racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java index 5fb01ee9..75b0e721 100644 --- a/racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java +++ b/racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java @@ -88,7 +88,7 @@ public class ConnectionAcceptor implements Runnable { DataOutputStream outToVisualiser = new DataOutputStream(mockSocket.getOutputStream()); MockOutput mockOutput = new MockOutput(latestMessages, outToVisualiser); - ControllerServer controllerServer = new ControllerServer(mockSocket); //TODO probably pass assigned boat source ID into ControllerServer. + ControllerServer controllerServer = new ControllerServer(mockSocket, this.rl); //TODO probably pass assigned boat source ID into ControllerServer. new Thread(mockOutput, "ConnectionAcceptor.run()->MockOutput thread" + mockOutput).start(); new Thread(controllerServer, "ConnectionAcceptor.run()->ControllerServer thread" + controllerServer).start(); diff --git a/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java b/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java index 7469fc26..63c5b263 100644 --- a/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java +++ b/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java @@ -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();