aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
michael.reiswich
2021-05-25 21:26:47 +02:00
parent 5044c8e295
commit 1152c4b11b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -524,7 +524,7 @@ namespace ReallifeGamemode.Server.Events
player.SendNotification("~y~[Info]~w~ Es sind genügend Beamte online!"); player.SendNotification("~y~[Info]~w~ Es sind genügend Beamte online!");
return; return;
} }
client.SetJailTime(true, dbcontext); client.SetJailTime(false, dbcontext);
Jail.Check_PutBehindBars(client, JailInLocations.Outside); Jail.Check_PutBehindBars(client, JailInLocations.Outside);
player.SendNotification("Du hast dich selbst eingeknastet"); player.SendNotification("Du hast dich selbst eingeknastet");
ChatService.HQMessage(player.Name + " wurde ins Gefängnis eingeliefert."); ChatService.HQMessage(player.Name + " wurde ins Gefängnis eingeliefert.");

2
ReallifeGamemode.Server/Finance/Economy.cs
View File

@@ -140,7 +140,7 @@ namespace ReallifeGamemode.Server.Finance
factionMoney = factionWage; factionMoney = factionWage;
} }
int otheramount = user.otheramount; 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); Paycheck paycheck = new Paycheck(financialHelp, financialInterest, vehicleTaxation, propertyTax, wage, amount, rentalFees, healthInsurance, gez, factionMoney, otheramount);
Paychecks[user.Id] = paycheck; Paychecks[user.Id] = paycheck;