From 69bfd8f54dfab295e238e28e3f961d44088867dc Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 15 Sep 2019 13:03:29 -0400
Subject: [PATCH] Static steam names

---
 .../io/anuke/mindustry/ui/dialogs/JoinDialog.java  | 14 +++++++++-----
 .../anuke/mindustry/desktop/DesktopLauncher.java   |  1 +
 .../src/io/anuke/mindustry/desktop/steam/SNet.java |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
index 16ecc370d6..03d2b2e1b4 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
@@ -231,11 +231,15 @@ public class JoinDialog extends FloatingDialog{
         cont.clear();
         cont.table(t -> {
             t.add("$name").padRight(10);
-            t.addField(Core.settings.getString("name"), text -> {
-                player.name = text;
-                Core.settings.put("name", text);
-                Core.settings.save();
-            }).grow().pad(8).get().setMaxLength(maxNameLength);
+            if(!steam){
+                t.addField(Core.settings.getString("name"), text -> {
+                    player.name = text;
+                    Core.settings.put("name", text);
+                    Core.settings.save();
+                }).grow().pad(8).get().setMaxLength(maxNameLength);
+            }else{
+                t.add(player.name).update(l -> l.setColor(player.color)).grow().pad(8);
+            }
 
             ImageButton button = t.addImageButton(Tex.whiteui, Styles.clearFulli, 40, () -> {
                 new ColorPickDialog().show(color -> {
diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
index a882dd8944..3ee6ec67b1 100644
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
@@ -130,6 +130,7 @@ public class DesktopLauncher extends ClientLauncher{
         SVars.user = new SUser();
 
         Events.on(ClientLoadEvent.class, event -> {
+            player.name = SVars.net.friends.getPersonaName();
             Core.settings.defaults("name", SVars.net.friends.getPersonaName());
             //update callbacks
             Core.app.addListener(new ApplicationListener(){
diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java b/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java
index ead602d839..ef6824b734 100644
--- a/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java
+++ b/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java
@@ -442,7 +442,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         @Override
         public boolean isConnected(){
             snet.getP2PSessionState(sid, state);
-            return state.isConnectionActive();
+            return true;//state.isConnectionActive();
         }
 
         @Override