Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled multiplayer for HTML5, net bugfixes

Browse Source
This commit is contained in:
Anuken
2018-01-19 18:27:41 -05:00
parent 1dad6b27c7
commit b1a38c3e61
11 changed files with 209 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/net/Net.java
+1 -1
View File
@@ -181,7 +181,7 @@ public class Net{
/**Get the client ping. Only valid after updatePing().*/
public static int getPing(){
return clientProvider.getPing();
return server() ? 0 : clientProvider.getPing();
}
/**Returns the last connection that sent a packet to this server.*/
core/src/io/anuke/mindustry/net/Packets.java
+4 -4
View File
@@ -49,7 +49,7 @@ public class Packets {
@Override
public void write(ByteBuffer buffer) {
buffer.put((byte)name.length());
buffer.put((byte)name.getBytes().length);
buffer.put(name.getBytes());
buffer.put(android ? (byte)1 : 0);
}
@@ -275,7 +275,7 @@ public class Packets {
@Override
public void write(ByteBuffer buffer) {
buffer.put((byte)name.length());
buffer.put((byte)name.getBytes().length);
buffer.put(name.getBytes());
buffer.put(weaponleft);
buffer.put(weaponright);
@@ -352,12 +352,12 @@ public class Packets {
@Override
public void write(ByteBuffer buffer) {
if(name != null) {
buffer.putShort((short) name.length());
buffer.putShort((short) name.getBytes().length);
buffer.put(name.getBytes());
}else{
buffer.putShort((short)-1);
}
buffer.putShort((short)text.length());
buffer.putShort((short)text.getBytes().length);
buffer.put(text.getBytes());
buffer.putInt(id);
}