From 5aa1e30006d9a423aca32625bbdb721870d719c9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 11 Feb 2020 13:08:42 -0500
Subject: [PATCH] Bugfix

---
 core/src/mindustry/core/NetServer.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index 4996f2f031..b840cc7a40 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -112,7 +112,6 @@ public class NetServer implements ApplicationListener{
             }
 
             PlayerInfo info = admins.getInfo(uuid);
-            info.adminUsid = packet.usid;
 
             con.hasBegunConnecting = true;
             con.mobile = packet.mobile;
@@ -218,6 +217,11 @@ public class NetServer implements ApplicationListener{
             player.color.set(packet.color);
             player.color.a = 1f;
 
+            //save admin ID but don't overwrite it
+            if(!player.isAdmin && !info.admin){
+                info.adminUsid = packet.usid;
+            }
+
             try{
                 writeBuffer.position(0);
                 player.write(outputBuffer);