fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77

Browse Source
This commit is contained in:
David Wu
2017-09-13 13:00:34 +12:00
parent 202c8d80c8 2c06a46ad2
commit c750b806e0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matchBrowser/src/main/java/networkInterface/NetworkInterface.java
+3 -2
View File
@@ -57,9 +57,10 @@ public class NetworkInterface {
public void run() { public void run() {
List<HostGame> games = new ArrayList<>(); List<HostGame> games = new ArrayList<>();
for(ClientAddress address: clientsAddresses) { for(Map.Entry<ClientAddress, HostGame> tableEntry: matchTable.getMatchTable().entrySet()) {
HostGame game = matchTable.getMatchTable().get(address); HostGame game = tableEntry.getValue();
if(game != null) { if(game != null) {
System.out.println(game.getIp());
games.add(game); games.add(game);
} }
} }
racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class MatchBrowserLobbyInterface extends Observable {
try { try {
HostGamesRequest message = (HostGamesRequest) hostedGamesRequestDecoder.decode(data); HostGamesRequest message = (HostGamesRequest) hostedGamesRequestDecoder.decode(data);
games = message.getKnownGames(); games = message.getKnownGames();
System.out.println(games); System.out.println(games.get(0).getIp());
setChanged(); setChanged();
notifyObservers(); notifyObservers();
} catch (InvalidMessageException e) { } catch (InvalidMessageException e) {