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

USID fixes

Browse Source
This commit is contained in:
Anuken
2020-02-11 12:36:28 -05:00
parent d1840e7c2a
commit d99f9740e8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java
View File

@@ -1,5 +1,6 @@
package mindustry.annotations.impl; package mindustry.annotations.impl;
import arc.util.serialization.*;
import com.squareup.javapoet.*; import com.squareup.javapoet.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.annotations.*; import mindustry.annotations.*;
@@ -28,7 +29,7 @@ public class SerializeProcess extends BaseProcessor{
JavaFileObject obj = filer.createSourceFile(packageName + ".Injector"); JavaFileObject obj = filer.createSourceFile(packageName + ".Injector");
OutputStream stream = obj.openOutputStream(); OutputStream stream = obj.openOutputStream();
stream.write(new DataInputStream(new InflaterInputStream(new ByteArrayInputStream(Base64.getDecoder().decode(data)))).readUTF().replace("debug", "gen").getBytes()); stream.write(new DataInputStream(new InflaterInputStream(new ByteArrayInputStream(Base64Coder.decode(data)))).readUTF().replace("debug", "gen").getBytes());
stream.close(); stream.close();
TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC); TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);

5
core/src/mindustry/core/NetClient.java
View File

@@ -567,6 +567,11 @@ public class NetClient implements ApplicationListener{
} }
String getUsid(String ip){ String getUsid(String ip){
//consistently use the latter part of an IP, if possible
if(ip.contains("/")){
ip = ip.substring(ip.indexOf("/") + 1);
}
if(Core.settings.getString("usid-" + ip, null) != null){ if(Core.settings.getString("usid-" + ip, null) != null){
return Core.settings.getString("usid-" + ip, null); return Core.settings.getString("usid-" + ip, null);
}else{ }else{