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

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-02-08 11:08:31 -05:00
parent 3a2fef3bd7
commit f3893533a4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/net/Packets.java
View File

@@ -154,7 +154,7 @@ public class Packets{
public int version; public int version;
public String versionType; public String versionType;
public Array<String> mods; public Array<String> mods;
public String name, uuid, usid; public String name, uuid, usid, legacyUuid;
public boolean mobile; public boolean mobile;
public int color; public int color;
@@ -166,6 +166,7 @@ public class Packets{
TypeIO.writeString(buffer, usid); TypeIO.writeString(buffer, usid);
buffer.put(mobile ? (byte)1 : 0); buffer.put(mobile ? (byte)1 : 0);
buffer.put(Base64Coder.decode(uuid)); buffer.put(Base64Coder.decode(uuid));
buffer.put(Base64Coder.decode(legacyUuid));
buffer.put((byte)color); buffer.put((byte)color);
buffer.put((byte)mods.size); buffer.put((byte)mods.size);
for(int i = 0; i < mods.size; i++){ for(int i = 0; i < mods.size; i++){
@@ -179,6 +180,9 @@ public class Packets{
versionType = TypeIO.readString(buffer); versionType = TypeIO.readString(buffer);
name = TypeIO.readString(buffer); name = TypeIO.readString(buffer);
usid = TypeIO.readString(buffer); usid = TypeIO.readString(buffer);
byte[] lidbytes = new byte[8];
buffer.get(lidbytes);
legacyUuid = new String(Base64Coder.encode(lidbytes));
mobile = buffer.get() == 1; mobile = buffer.get() == 1;
color = buffer.getInt(); color = buffer.getInt();
byte[] idbytes = new byte[8]; byte[] idbytes = new byte[8];