From d99f9740e8d3e61fd25fe22ffc15b7f6959181ef Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 11 Feb 2020 12:36:28 -0500
Subject: [PATCH] USID fixes

---
 .../java/mindustry/annotations/impl/SerializeProcess.java    | 3 ++-
 core/src/mindustry/core/NetClient.java                       | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java b/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java
index 061836257e..96c5232406 100644
--- a/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java
@@ -1,5 +1,6 @@
 package mindustry.annotations.impl;
 
+import arc.util.serialization.*;
 import com.squareup.javapoet.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.annotations.*;
@@ -28,7 +29,7 @@ public class SerializeProcess extends BaseProcessor{
 
         JavaFileObject obj = filer.createSourceFile(packageName + ".Injector");
         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();
 
         TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index 270dfa0874..0a15536cc4 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -567,6 +567,11 @@ public class NetClient implements ApplicationListener{
     }
 
     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){
             return Core.settings.getString("usid-" + ip, null);
         }else{