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

Merge remote-tracking branch 'origin/master' into boat_movement_smooth

Browse Source
This commit is contained in:
fjc40
2017-09-15 09:04:42 +12:00
parent 2c92102b2a d660cd9e78
commit eacbe8d8ea
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matchBrowser/src/main/java/networkInterface/NetworkInterface.java
+3
View File
@@ -67,7 +67,9 @@ public class NetworkInterface {
HostedGamesRequestEncoder encoder = new HostedGamesRequestEncoder(); HostedGamesRequestEncoder encoder = new HostedGamesRequestEncoder();
try { try {
byte[] message = encoder.encode(new HostGamesRequest(games)); byte[] message = encoder.encode(new HostGamesRequest(games));
System.out.println(LocalDateTime.now() + ": Sending " + games.size() + " game/s");
for(ClientAddress address: clientsAddresses) { for(ClientAddress address: clientsAddresses) {
System.out.println("Sending to " + address.getIp());
serverSocket.send(new DatagramPacket(message, message.length, InetAddress.getByName(address.getIp()), 4941)); serverSocket.send(new DatagramPacket(message, message.length, InetAddress.getByName(address.getIp()), 4941));
} }
} catch (InvalidMessageException | IOException e) { } catch (InvalidMessageException | IOException e) {
@@ -85,6 +87,7 @@ public class NetworkInterface {
scheduler.scheduleAtFixedRate(new TimerTask() { scheduler.scheduleAtFixedRate(new TimerTask() {
@Override @Override
public void run() { public void run() {
System.out.println("flush");
matchTable.getMatchTable().clear(); matchTable.getMatchTable().clear();
} }
}, period, period); }, period, period);
racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java
+2 -1
View File
@@ -26,7 +26,8 @@ public class MatchBrowserInterface {
public MatchBrowserInterface() { public MatchBrowserInterface() {
try {//132.181.16.13 is the ip of the CI as of 13/9/17 try {//132.181.16.13 is the ip of the CI as of 13/9/17
this.IPAddress = InetAddress.getByName("132.181.16.13"); //InetAddress.getLocalHost(); this.IPAddress = InetAddress.getByName("umbrasheep.com"); //InetAddress.getLocalHost();
this.IPAddress = InetAddress.getByName("191.101.233.116"); //InetAddress.getLocalHost();
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
e.printStackTrace(); e.printStackTrace();
} }