From 2c06a46ad262090e6a09f7992909c06fc1c41803 Mon Sep 17 00:00:00 2001 From: hba56 Date: Wed, 13 Sep 2017 12:59:49 +1200 Subject: [PATCH] send out to every client fix --- .../java/networkInterface/NetworkInterface.java | 5 +++-- .../network/MatchBrowserLobbyInterface.java | 2 +- settings/keyBindings.xml | 14 +++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/matchBrowser/src/main/java/networkInterface/NetworkInterface.java b/matchBrowser/src/main/java/networkInterface/NetworkInterface.java index dd01b16b..52146149 100644 --- a/matchBrowser/src/main/java/networkInterface/NetworkInterface.java +++ b/matchBrowser/src/main/java/networkInterface/NetworkInterface.java @@ -57,9 +57,10 @@ public class NetworkInterface { public void run() { List games = new ArrayList<>(); - for(ClientAddress address: clientsAddresses) { - HostGame game = matchTable.getMatchTable().get(address); + for(Map.Entry tableEntry: matchTable.getMatchTable().entrySet()) { + HostGame game = tableEntry.getValue(); if(game != null) { + System.out.println(game.getIp()); games.add(game); } } diff --git a/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java b/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java index 83674fe4..e22b5cf5 100644 --- a/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java +++ b/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java @@ -47,7 +47,7 @@ public class MatchBrowserLobbyInterface extends Observable { try { HostGamesRequest message = (HostGamesRequest) hostedGamesRequestDecoder.decode(data); games = message.getKnownGames(); - System.out.println(games); + System.out.println(games.get(0).getIp()); setChanged(); notifyObservers(); } catch (InvalidMessageException e) { diff --git a/settings/keyBindings.xml b/settings/keyBindings.xml index 8aa46d6c..2b807e17 100644 --- a/settings/keyBindings.xml +++ b/settings/keyBindings.xml @@ -1,5 +1,5 @@ - + SPACE @@ -10,8 +10,8 @@ - LEFT - + DOWN + X @@ -21,13 +21,13 @@ ENTER - - RIGHT - - Z + + UP + +