Hotfix SteamwarUser and ServerStarter

CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt

@@ -169,8 +169,8 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
         }
     fun isLeader() = leader
 
-    var locale: Locale? by SteamwarUserTable.locale
-        .transform({ it?.toLanguageTag() }, { it?.let { Locale.forLanguageTag(it) } })
+    var locale: Locale by SteamwarUserTable.locale
+        .transform({ it.toLanguageTag() }, { it?.let { Locale.forLanguageTag(it) } ?: Locale.ENGLISH })
     var manualLocale by SteamwarUserTable.manualLocale
     var bedrock by SteamwarUserTable.bedrock
     private var passwordInternal by SteamwarUserTable.password

buildSrc/src/steamwar.devserver.gradle

@@ -138,7 +138,7 @@ class DevServer extends DefaultTask {
         }
     }
 
-    private void closeProcess(Process process) {
+    private static void closeProcess(Process process) {
         process.outputStream.close()
         process.inputStream.close()
         process.errorStream.close()
@@ -152,7 +152,7 @@ class DevServer extends DefaultTask {
             String serverTemplateName = new BufferedReader(new InputStreamReader(process.inputStream)).lines().collect(Collectors.joining("\n"))
                     .trim()
                     .substring("Folder: ".length())
-            closeProcess(process);
+            DevServer.closeProcess(process)
             setupTemplate(serverTemplateName)
             run("ln -s $serverTemplateName $template")
             return
@@ -160,10 +160,10 @@ class DevServer extends DefaultTask {
         if (!checkFileOnRemote("/servers/$template")) {
             throw new GradleException("Used template ($template) is not in /servers/ directory of the given host $host")
         }
-        closeProcess(run("cp -r /servers/$template $template"))
-        closeProcess(run("chmod u+w $template"))
-        closeProcess(run("rm -r $template/plugins/*WorldEdit/"))
-        closeProcess(run("rm $template/log4j2.xml"))
+        DevServer.closeProcess(run("cp -r /servers/$template $template"))
+        DevServer.closeProcess(run("chmod u+w $template"))
+        DevServer.closeProcess(run("rm -r $template/plugins/*WorldEdit/"))
+        DevServer.closeProcess(run("rm $template/log4j2.xml"))
     }
 
     void uploadDependencies() {
@@ -191,7 +191,7 @@ class DevServer extends DefaultTask {
             process.inputStream.readLines().forEach {
                 same |= it.startsWith(sb.toString().toLowerCase())
             }
-            closeProcess(process);
+            DevServer.closeProcess(process)
             if (same) {
                 println("Skipping  $archive")
                 return
@@ -200,11 +200,11 @@ class DevServer extends DefaultTask {
             println("Uploading $archive")
             process = new ProcessBuilder("ssh", host, "-T", "rm $base/${archive.name.replace("-all", "")}").start()
             process.waitFor()
-            closeProcess(process)
+            DevServer.closeProcess(process)
 
             process = new ProcessBuilder("scp", archive.absolutePath, "$host:~/$base/${archive.name.replace("-all", "")}").start();
             process.waitFor()
-            closeProcess(process)
+            DevServer.closeProcess(process)
             println("Uploaded  $archive")
         }
     }