Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2021-02-23 17:07:45 -05:00
parent 502c7eb388 ad2a18f929
commit befda9baaa
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/core/NetClient.java
View File

@@ -26,6 +26,7 @@ import mindustry.world.*;
import mindustry.world.modules.*; import mindustry.world.modules.*;
import java.io.*; import java.io.*;
import java.util.*;
import java.util.zip.*; import java.util.zip.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -73,9 +74,14 @@ public class NetClient implements ApplicationListener{
disconnectQuietly(); disconnectQuietly();
}); });
String locale = Core.settings.getString("locale");
if(locale.equals("default")){
locale = Locale.getDefault().toString();
}
ConnectPacket c = new ConnectPacket(); ConnectPacket c = new ConnectPacket();
c.name = player.name; c.name = player.name;
c.locale = Core.settings.getString("locale"); c.locale = locale;
c.mods = mods.getModStrings(); c.mods = mods.getModStrings();
c.mobile = mobile; c.mobile = mobile;
c.versionType = Version.type; c.versionType = Version.type;

2
core/src/mindustry/core/NetServer.java
View File

@@ -196,7 +196,7 @@ public class NetServer implements ApplicationListener{
} }
if(packet.locale == null){ if(packet.locale == null){
packet.locale = "en_US"; packet.locale = "en";
} }
String ip = con.address; String ip = con.address;