From 54b647c38e923bfedbd4d074dd253beeba4d0540 Mon Sep 17 00:00:00 2001
From: hydrant <lennart@kampshoff.xyz>
Date: Thu, 6 Dec 2018 19:32:37 +0100
Subject: [PATCH] Some improvements

---
 Client/Gui/infobox.js                 | 2 +-
 Server/Events/Death.cs                | 1 +
 Server/Events/Register.cs             | 5 ++++-
 Server/Extensions/IntegerExtension.cs | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Client/Gui/infobox.js b/Client/Gui/infobox.js
index f8262bd2..f631969f 100644
--- a/Client/Gui/infobox.js
+++ b/Client/Gui/infobox.js
@@ -69,7 +69,7 @@ mp.events.add("toggleUi", (show) => {
 //}
 
 mp.events.add("updateMoney", (money) => {
-    playerMoney = money;
+    playerMoney = money.toLocaleString("de-DE", { minimumFractionDigits: 0 });
 });
 
 mp.events.add("render", () => {
diff --git a/Server/Events/Death.cs b/Server/Events/Death.cs
index 04faaefb..578072f6 100644
--- a/Server/Events/Death.cs
+++ b/Server/Events/Death.cs
@@ -22,6 +22,7 @@ namespace reallife_gamemode.Server.Events
         [ServerEvent(Event.PlayerDeath)]
         public void OnPlayerDeath(Client player, Client killer, uint reason)
         {
+            if (!player.IsLoggedIn()) player.Kick();
             player.SetData("isDead", true);
 
             if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true)
diff --git a/Server/Events/Register.cs b/Server/Events/Register.cs
index 7e285c7d..01b503ee 100644
--- a/Server/Events/Register.cs
+++ b/Server/Events/Register.cs
@@ -28,7 +28,10 @@ namespace reallife_gamemode.Server.Events
                     {
                         Name = player.Name,
                         SocialClubName = player.SocialClubName,
-                        Password = NAPI.Util.GetHashSha256(password)
+                        Password = NAPI.Util.GetHashSha256(password),
+                        PositionX = Main.DEFAULT_SPAWN_POSITION.X,
+                        PositionY = Main.DEFAULT_SPAWN_POSITION.Y,
+                        PositionZ = Main.DEFAULT_SPAWN_POSITION.Z
                     };
 
                     dbContext.Users.Add(user);
diff --git a/Server/Extensions/IntegerExtension.cs b/Server/Extensions/IntegerExtension.cs
index 96bd1aa8..d5172998 100644
--- a/Server/Extensions/IntegerExtension.cs
+++ b/Server/Extensions/IntegerExtension.cs
@@ -12,7 +12,7 @@ namespace reallife_gamemode.Server.Extensions
         }
         public static string ToMoneyString(this int money)
         {
-            return string.Format(Main.SERVER_CULTURE, "{0:C0}", money).Replace('€', '$');
+            return "$" + string.Format(Main.SERVER_CULTURE, "{0:C0}", money).Replace("€", "");
         }
     }
 }