Merge branch 'develop' into 'feature/atm-system'

# Conflicts: # ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
2019-04-02 18:50:17 +02:00
parent bed35f8f08
commit 63838e133a
20 changed files with 1226 additions and 42 deletions
--- a/ReallifeGamemode.Server/Events/Login.cs
+++ b/ReallifeGamemode.Server/Events/Login.cs
@@ -44,6 +44,7 @@ namespace ReallifeGamemode.Server.Events
                        player.SetData("isLoggedIn", true);
                        player.SetData("spec", true);
                        player.SetData("duty", false);
+                        player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney, 0);

                        if (user.IsAdmin(AdminLevel.HEADADMIN) == true)
                        {