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 14:00:36 +12:00
parent 89ce8a7cc0 731c0b0e61
commit f926355d1c
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/network/MessageDecoders/HostGameMessageDecoder.java
+2 -1
View File
@@ -10,6 +10,7 @@ import network.Messages.RaceStatus;
import java.util.Arrays;
import static network.Utils.ByteConverter.bytesToInt;
import static network.Utils.ByteConverter.bytesToLong;
public class HostGameMessageDecoder implements MessageDecoder {
@@ -38,7 +39,7 @@ public class HostGameMessageDecoder implements MessageDecoder {
byte ipPart2 = encodedMessage[1];
byte ipPart3 = encodedMessage[2];
byte ipPart4 = encodedMessage[3];
String ipString = ipPart1 + "." + ipPart2 + "." + ipPart3 + "." + ipPart4;
String ipString = bytesToLong(ipPart1) + "." + bytesToLong(ipPart2) + "." + bytesToLong(ipPart3) + "." + bytesToLong(ipPart4);
// System.out.println(ipString);
int port = bytesToInt(Arrays.copyOfRange(encodedMessage, 4, 8));
byte map = encodedMessage[8];
racevisionGame/src/main/java/network/Messages/HostGame.java
+10
View File
@@ -3,6 +3,11 @@ package network.Messages;
import network.Messages.Enums.MessageType;
import network.Messages.Enums.RaceStatusEnum;
import network.Utils.ByteConverter;
import java.nio.ByteBuffer;
import static network.Utils.ByteConverter.intToBytes;
public class HostGame extends AC35Data {
@@ -76,4 +81,9 @@ public class HostGame extends AC35Data {
public byte getCurrentNumPlayers() {
return currentNumPlayers;
}
public void setIp(String ip) {
this.ip = ip;
}
}