From c14532ecae6c30fa4821bdd7e317bf0b623dd162 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 25 Jul 2021 12:04:17 -0400
Subject: [PATCH] Fixed #5645

---
 core/assets/bundles/bundle.properties             | 1 +
 core/src/mindustry/content/Fx.java                | 2 +-
 core/src/mindustry/game/Schematics.java           | 5 +++++
 core/src/mindustry/io/SaveVersion.java            | 2 +-
 core/src/mindustry/type/UnitType.java             | 2 ++
 core/src/mindustry/ui/dialogs/JoinDialog.java     | 2 +-
 core/src/mindustry/ui/fragments/MenuFragment.java | 2 --
 7 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 6104dac106..303aae648f 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -215,6 +215,7 @@ hosts.none = [lightgray]No local games found!
 host.invalid = [scarlet]Can't connect to host.
 
 servers.local = Local Servers
+servers.local.steam = Open Games & Local Servers
 servers.remote = Remote Servers
 servers.global = Community Servers
 
diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
index 2eb71b595b..509167dd6b 100644
--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -1628,7 +1628,7 @@ public class Fx{
     coalSmeltsmoke = new Effect(40f, e -> {
         randLenVectors(e.id, 0.2f + e.fin(), 4, 6.3f, (x, y, fin, out) -> {
             color(Color.darkGray, Pal.coalBlack, e.finpowdown());
-            Fill.circle(e.x + x, e.y + y, out * 2f + 0.25f);
+            Fill.circle(e.x + x, e.y + y, out * 2f + 0.35f);
         });
     }),
 
diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java
index f21381802c..d1eefe211f 100644
--- a/core/src/mindustry/game/Schematics.java
+++ b/core/src/mindustry/game/Schematics.java
@@ -432,6 +432,11 @@ public class Schematics implements Loadable{
                 if(seq.contains(t -> !t.block().alwaysReplace && !t.synthetic())){
                     return;
                 }
+                for(var t : seq){
+                    if(t.block() != Blocks.air){
+                        t.remove();
+                    }
+                }
             }
 
             tile.setBlock(st.block, team, st.rotation);
diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java
index 90fd35a59d..904591f268 100644
--- a/core/src/mindustry/io/SaveVersion.java
+++ b/core/src/mindustry/io/SaveVersion.java
@@ -363,7 +363,7 @@ public abstract class SaveVersion extends SaveFileReader{
         int amount = stream.readInt();
         for(int j = 0; j < amount; j++){
             readChunk(stream, true, in -> {
-                byte typeid = in.readByte();
+                int typeid = in.readUnsignedByte();
                 if(mapping[typeid] == null){
                     in.skipBytes(lastRegionLength - 1);
                     return;
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index b3f15477b0..7d8291e4d2 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -41,7 +41,9 @@ public class UnitType extends UnlockableContent{
 
     /** If true, the unit is always at elevation 1. */
     public boolean flying;
+    /** Creates a new instance of this unit class. */
     public Prov<? extends Unit> constructor;
+    /** The default AI controller to assign on creation. */
     public Prov<? extends UnitController> defaultController = () -> !flying ? new GroundAI() : new FlyingAI();
 
     /** Environmental flags that are *all* required for this unit to function. 0 = any environment */
diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 40ec81d077..89ac9464a6 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -271,7 +271,7 @@ public class JoinDialog extends BaseDialog{
 
         hosts.clear();
 
-        section("@servers.local", local, false);
+        section(steam ? "@servers.local.steam" : "@servers.local", local, false);
         section("@servers.remote", remote, false);
         section("@servers.global", global, true);
 
diff --git a/core/src/mindustry/ui/fragments/MenuFragment.java b/core/src/mindustry/ui/fragments/MenuFragment.java
index da51d18ede..ca3001f5b5 100644
--- a/core/src/mindustry/ui/fragments/MenuFragment.java
+++ b/core/src/mindustry/ui/fragments/MenuFragment.java
@@ -120,7 +120,6 @@ public class MenuFragment extends Fragment{
                 table.add(tools);
 
                 table.add(mods);
-                //if(platform.canDonate()) table.add(donate);
                 if(!ios) table.add(exit);
             }).colspan(4);
         }else{
@@ -139,7 +138,6 @@ public class MenuFragment extends Fragment{
                 table.defaults().set(container.defaults());
 
                 table.add(mods);
-                //if(platform.canDonate()) table.add(donate);
                 if(!ios) table.add(exit);
             }).colspan(2);
         }