diff --git a/ReallifeGamemode.Database/Entities/User.cs b/ReallifeGamemode.Database/Entities/User.cs index 043e32bd..b20b3f2b 100644 --- a/ReallifeGamemode.Database/Entities/User.cs +++ b/ReallifeGamemode.Database/Entities/User.cs @@ -21,6 +21,9 @@ namespace ReallifeGamemode.Database.Entities [NotMapped] private int _wanteds; + [NotMapped] + private int _handMoney; + [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; } @@ -40,7 +43,16 @@ namespace ReallifeGamemode.Database.Entities public AdminLevel AdminLevel { get; set; } public bool Dead { get; set; } - public int Handmoney { get; set; } + public int Handmoney + { + get => _handMoney; + + set + { + _handMoney = value; + Player.TriggerEvent("SERVER:SET_HANDMONEY", value); + } + } public float PositionX { get; set; } public float PositionY { get; set; } diff --git a/ReallifeGamemode.Server/Managers/SaveManager.cs b/ReallifeGamemode.Server/Managers/SaveManager.cs index 7025c1e8..db6f8216 100644 --- a/ReallifeGamemode.Server/Managers/SaveManager.cs +++ b/ReallifeGamemode.Server/Managers/SaveManager.cs @@ -210,8 +210,13 @@ namespace ReallifeGamemode.Server.Managers //Alle Spieler foreach (Player player in NAPI.Pools.GetAllPlayers()) { - Vector3 pos = player.Position; User user = player.GetUser(saveAll); + if (user == null) + { + continue; + } + + Vector3 pos = player.Position; user.PositionX = pos.X; user.PositionY = pos.Y; user.PositionZ = pos.Z;