Merge

2020-02-13 11:22:29 -05:00
parent 6fd0205495 0678f54e25
commit 47f075133f
27 changed files with 270 additions and 204 deletions
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -242,6 +242,9 @@ public class JoinDialog extends FloatingDialog{
    }

    void setup(){
+        local.clear();
+        remote.clear();
+        global.clear();
        float w = targetWidth();

        hosts.clear();
@@ -255,7 +258,6 @@ public class JoinDialog extends FloatingDialog{
        pane.setScrollingDisabled(true, false);

        setupRemote();
-        refreshRemote();

        cont.clear();
        cont.table(t -> {