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

Merging game lobby with game state broadcast

Browse Source
This commit is contained in:
Kusal Ekanayake
2017-07-24 15:01:07 +12:00
parent 3e4a6f0f2e
commit 1daac842f2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/LobbyController.java
+1 -1
View File
@@ -157,7 +157,7 @@ public class LobbyController implements Initializable, Observer{
if (competitorIndex >= 8) { if (competitorIndex >= 8) {
break; break;
} }
if (!yachtId.equals(ClientState.getClientSourceId())) { if (!yachtId.equals(Integer.parseInt(ClientState.getClientSourceId()))) {
competitors.get(competitorIndex).add(String.valueOf(yachtId)); competitors.get(competitorIndex).add(String.valueOf(yachtId));
competitorIndex++; competitorIndex++;
} }
src/main/java/seng302/gameServer/ServerToClientThread.java
+1 -1
View File
@@ -351,7 +351,7 @@ public class ServerToClientThread implements Runnable {
} }
} }
}
public Thread getThread() { public Thread getThread() {