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

Fixed bug that stopped clients from getting updated xml data.

Browse Source 
#issue[46] #bug
This commit is contained in:
Calum
2017-08-13 20:29:10 +12:00
parent 6218d5506b
commit 0ee12021e2
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/ServerToClientThread.java
-17
View File
@@ -63,7 +63,6 @@ public class ServerToClientThread implements Runnable {
private ByteArrayOutputStream crcBuffer; private ByteArrayOutputStream crcBuffer;
private Boolean updateClient = true;
// private Boolean initialisedRace = true; // private Boolean initialisedRace = true;
private Integer seqNo; private Integer seqNo;
@@ -169,20 +168,6 @@ public class ServerToClientThread implements Runnable {
while (socket.isConnected()) { while (socket.isConnected()) {
try { try {
//Perform a write if it is time to as delegated by the MainServerThread
if (updateClient) {
// TODO: 13/07/17 wmu16 - Write out game state - some function that would write all appropriate messages to this output stream
// ChatterMessage chatterMessage = new ChatterMessage(4, 14, "Hello, it's me");
// sendMessage(chatterMessage);
// try {
// GameState.outputState(os);
// } catch (IOException e) {
// System.out.println("IO error in server thread upon writing to output stream");
// }
// sendBoatLocationPackets();
updateClient = false;
}
crcBuffer = new ByteArrayOutputStream(); crcBuffer = new ByteArrayOutputStream();
sync1 = readByte(); sync1 = readByte();
sync2 = readByte(); sync2 = readByte();
@@ -256,7 +241,6 @@ public class ServerToClientThread implements Runnable {
public void updateClient() { public void updateClient() {
sendBoatLocationPackets(); sendBoatLocationPackets();
updateClient = true;
} }
private void closeSocket() { private void closeSocket() {
@@ -317,7 +301,6 @@ public class ServerToClientThread implements Runnable {
private void sendBoatLocationPackets() { private void sendBoatLocationPackets() {
ArrayList<Yacht> yachts = new ArrayList<>(GameState.getYachts().values()); ArrayList<Yacht> yachts = new ArrayList<>(GameState.getYachts().values());
for (Yacht yacht : yachts) { for (Yacht yacht : yachts) {
// System.out.println("[SERVER] Lat: " + yacht.getLocation().getLat() + " Lon: " + yacht.getLocation().getLng());
BoatLocationMessage boatLocationMessage = BoatLocationMessage boatLocationMessage =
new BoatLocationMessage( new BoatLocationMessage(
yacht.getSourceId(), yacht.getSourceId(),