diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 71e95ff3..0c2e3e3b 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -2216,7 +2216,7 @@ namespace ReallifeGamemode.Server.Commands user.SafeTeleport(pos); } - [Command("sethandmoney", "~m~Benutzung: ~s~/sethandmoney [Name/ID] [Menge]")] + [Command("sethandmoney", "~m~Benutzung: ~s~/sethandmoney [Spieler] [Menge]")] public void CmdAdminSetHandMoney(Player admin, string targetname, int amount) { if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) @@ -2231,19 +2231,23 @@ namespace ReallifeGamemode.Server.Commands ChatService.PlayerNotFound(target); return; } + + int currentBalance = 0; using (var context = new DatabaseContext()) { var user = target.GetUser(context); + currentBalance = user.Handmoney; user.Handmoney = amount; - logger.LogInformation("Admin {0} set the handmoney of player {1} to {2} dollars", admin.Name, target.Name, amount); + logger.LogInformation("Admin {0} set the handmoney of {1} from {2} to {3} dollars", admin.Name, target.Name, currentBalance, amount); context.SaveChanges(); //target.TriggerEvent("SERVER:SET_HANDMONEY", amount); } - ChatService.SendMessage(admin, "~b~[ADMIN]~s~ Du hast das Handgeld von " + target.Name + " auf ~g~$" + amount + "~s~ gesetzt."); - ChatService.SendMessage(target, "~b~[ADMIN]~s~ Dein Handgeld wurde von Admin " + admin.Name + " auf ~g~$" + amount + "~s~ gesetzt."); + + ChatService.SendMessage(admin, $"~b~[ADMIN] ~s~Du hast das Handgeld von ~b~{target.Name} ~s~auf {amount.ToMoneyString()} gesetzt (Bisher: {currentBalance.ToMoneyString()})."); + ChatService.SendMessage(target, $"~b~[ADMIN] ~s~Dein Handgeld wurde von ~b~{admin.Name} ~s~auf {amount.ToMoneyString()} gesetzt."); } - [Command("givehandmoney", "~m~Benutzung: ~s~/givehandmoney [Name/ID] [Menge]")] + [Command("givehandmoney", "~m~Benutzung: ~s~/givehandmoney [Spieler] [Menge]")] public void CmdAdminGiveHandMoney(Player admin, string targetname, int amount) { if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) @@ -2261,13 +2265,16 @@ namespace ReallifeGamemode.Server.Commands using (var context = new DatabaseContext()) { var user = target.GetUser(context); + int currentBalance = user.Handmoney; user.Handmoney += amount; - logger.LogInformation("Admin {0} added {2} dollarsto the handmoney of player {1}", admin.Name, target.Name, amount); + + logger.LogInformation("Admin {0} added {2} dollars to the handmoney of player {1} (now: {2})", admin.Name, target.Name, amount, currentBalance); + context.SaveChanges(); //target.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); } - ChatService.SendMessage(admin, "~b~[ADMIN]~s~ Du hast " + target.Name + " ~g~$" + amount + "~s~ auf die Hand gegeben."); - ChatService.SendMessage(target, "~b~[ADMIN]~s~ Admin " + admin.Name + " hat dir ~g~$" + amount + "~s~ auf die Hand gegeben."); + ChatService.SendMessage(admin, $"~b~[ADMIN] ~s~Du hast {target.Name} ~g~{amount.ToMoneyString()} ~s~auf die Hand gegeben."); + ChatService.SendMessage(target, $"~b~[ADMIN] ~s~{admin.Name} hat dir ~g~{amount.ToMoneyString()} ~s~auf die Hand gegeben."); } [Command("quicksavemode", "~m~Benutzung: ~s~/quicksavemode [Modus]: ~g~blip, ~g~atm")] @@ -3298,18 +3305,20 @@ namespace ReallifeGamemode.Server.Commands return; } + int currentBalance = 0; using (var dbContext = new DatabaseContext()) { - logger.LogInformation("Admin {0} set the bank account of {1} to {2} dollars", player.Name, target.Name, amount); + currentBalance = target.GetUser(dbContext).BankAccount.Balance; + logger.LogInformation("Admin {0} set the bank account of {1} from {2} to {3} dollars", player.Name, target.Name, currentBalance, amount); target.GetUser(dbContext).BankAccount.Balance = amount; dbContext.SaveChanges(); } - ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du hast das Geld von " + target.Name + " auf ~g~$" + amount + "~s~ gesetzt."); - ChatService.SendMessage(target, "~b~[ADMIN]~s~ Dein Geld wurde von Admin " + player.Name + " auf ~g~$" + amount + "~s~ gesetzt."); + ChatService.SendMessage(player, $"~b~[ADMIN] ~s~Du hast den Kontostand von ~b~{target.Name} ~s~auf {amount.ToMoneyString()} gesetzt (Bisher: {currentBalance})."); + ChatService.SendMessage(target, $"~b~[ADMIN] ~s~Dein Kontostand wurde von ~b~{player.Name} ~s~auf {amount.ToMoneyString()} gesetzt."); } [Command("givemoney", "~m~Benutzung: ~s~/givemoney [Name] [Menge]")] - public void GiveAdminGiveMoney(Player player, string receiver, int amount) + public void CmdAdminGiveMoney(Player player, string receiver, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3326,12 +3335,13 @@ namespace ReallifeGamemode.Server.Commands using (var dbContext = new DatabaseContext()) { - logger.LogInformation("Admin {0} added {1} dollars to the bank account of {2}", player.Name, amount, target.Name); + int currentBalance = target.GetUser(dbContext).BankAccount.Balance; + logger.LogInformation("Admin {0} added {1} dollars to the bank account of {2} (now: {3})", player.Name, amount, target.Name, currentBalance); target.GetUser(dbContext).BankAccount.Balance += amount; dbContext.SaveChanges(); } - ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du hast " + target.Name + " ~g~$" + amount + "~s~ gegeben."); - ChatService.SendMessage(target, "~b~[ADMIN]~s~ Admin " + player.Name + " hat dir ~g~$" + amount + "~s~ gegeben."); + ChatService.SendMessage(player, $"~b~[ADMIN] ~s~Du hast ~b~{target.Name} ~s~{amount.ToMoneyString()} gegeben."); + ChatService.SendMessage(target, $"~b~[ADMIN] {player.Name} ~s~hat dir {amount.ToMoneyString()} gegeben."); } [Command("setbusinessowner", "~m~Benutzung: ~s~/setbusinessowner [Name] [Business ID]")]