From 1152c4b11bd44cb7865db32d9d0bb9c4f6e51382 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 25 May 2021 21:26:47 +0200 Subject: [PATCH] changes --- ReallifeGamemode.Server/Events/Key.cs | 2 +- ReallifeGamemode.Server/Finance/Economy.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 8ba7d69b..6bffa2d9 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -524,7 +524,7 @@ namespace ReallifeGamemode.Server.Events player.SendNotification("~y~[Info]~w~ Es sind genügend Beamte online!"); return; } - client.SetJailTime(true, dbcontext); + client.SetJailTime(false, dbcontext); Jail.Check_PutBehindBars(client, JailInLocations.Outside); player.SendNotification("Du hast dich selbst eingeknastet"); ChatService.HQMessage(player.Name + " wurde ins Gefängnis eingeliefert."); diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index 89e7fde9..1750ce42 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -140,7 +140,7 @@ namespace ReallifeGamemode.Server.Finance factionMoney = factionWage; } int otheramount = user.otheramount; - int amount = wage - (int)(wage * financialInterest) - vehicleTaxation - (int)propertyTax + (int)financialHelp - rentalFees - healthInsurance + gez + (factionMoney ?? 0) + otheramount; + int amount = wage - (int)(wage * financialInterest) - vehicleTaxation - (int)propertyTax + (int)financialHelp - rentalFees - healthInsurance - gez + (factionMoney ?? 0) + otheramount; Paycheck paycheck = new Paycheck(financialHelp, financialInterest, vehicleTaxation, propertyTax, wage, amount, rentalFees, healthInsurance, gez, factionMoney, otheramount); Paychecks[user.Id] = paycheck;