From 975b2bb8e65bd633c2f3ec4e8b1d1a9cb5f07a5e Mon Sep 17 00:00:00 2001
From: Chaoscaot <max@maxsp.de>
Date: Sat, 20 Dec 2025 21:35:34 +0100
Subject: [PATCH] Fix Kits and Maybe? Locale

Signed-off-by: Chaoscaot <max@maxsp.de>
---
 .gitignore                                         | 3 ++-
 CommonCore/SQL/src/de/steamwar/sql/PersonalKit.kt  | 2 +-
 CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index cc1b960d..803a132b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ lib
 /WebsiteBackend/data
 /WebsiteBackend/logs
 /WebsiteBackend/skins
-/WebsiteBackend/config.json
\ No newline at end of file
+/WebsiteBackend/config.json
+/WebsiteBackend/sessions
\ No newline at end of file
diff --git a/CommonCore/SQL/src/de/steamwar/sql/PersonalKit.kt b/CommonCore/SQL/src/de/steamwar/sql/PersonalKit.kt
index 5daa1128..c8b6d897 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/PersonalKit.kt
+++ b/CommonCore/SQL/src/de/steamwar/sql/PersonalKit.kt
@@ -54,7 +54,7 @@ class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {
 
         @JvmStatic
         fun get(userId: Int, gamemode: String, kitName: String) = useDb {
-            get(CompositeID {
+            findById(CompositeID {
                 it[PersonalKitTable.userId] = EntityID(userId, SteamwarUserTable)
                 it[PersonalKitTable.gamemode] = gamemode
                 it[PersonalKitTable.kitName] = kitName
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt b/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt
index 3f07d42d..8f747046 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt
+++ b/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) } ?: Locale.getDefault()})
+    var locale: Locale? by SteamwarUserTable.locale
+        .transform({ it?.toLanguageTag() }, { it?.let { Locale.forLanguageTag(it) } })
     var manualLocale by SteamwarUserTable.manualLocale
     var bedrock by SteamwarUserTable.bedrock
     private var passwordInternal by SteamwarUserTable.password