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

fix handmoney (SET:HANDMONEY auskommentiert)

Browse Source
This commit is contained in:
Michael
2020-07-05 16:46:59 +02:00
parent cffcc5659a
commit dd5292e3db
8 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ReallifeGamemode.Server/Bank/bank.cs
View File

@@ -1,4 +1,9 @@
using GTANetworkAPI;
/**
* @overview Life of German Reallife - Managers Interaction (InteractionManager.cs)
* @author MichaPlays
* @copyright (c) 2008 - 2018 Life of German
*/
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
@@ -83,7 +88,7 @@ namespace ReallifeGamemode.Server.Bank
}
else
{
player.SendNotification($"~w~Du hast $~g~{amount} ~w~eingezahlt.");
player.SendNotification($"~w~Du hast $~g~{amount} ~w~eingezahlt.");
player.GetUser(dbContext).Handmoney -= amount;
player.GetUser(dbContext).BankAccount.Balance += amount;
dbContext.SaveChanges();
@@ -139,7 +144,7 @@ namespace ReallifeGamemode.Server.Bank
}
else
{
player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~ Überwiesen.");
player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~Überwiesen.");
player.GetUser(dbContext).BankAccount.Balance -= (int)(amount*1.05);
target.GetUser(dbContext).otheramount = amount;
dbContext.SaveChanges();
@@ -162,7 +167,7 @@ namespace ReallifeGamemode.Server.Bank
}
else
{
player.SendNotification($"~w~Du hast $~g~{amount} ~w~ in die Fraktionskasse eingezahlt.");
player.SendNotification($"~w~Du hast $~g~{amount}~w~ in die Fraktionskasse eingezahlt.");
player.GetUser(dbContext).Handmoney -= amount;
player.GetUser(dbContext).Faction.BankAccount.Balance += amount;
dbContext.SaveChanges();
@@ -191,7 +196,7 @@ namespace ReallifeGamemode.Server.Bank
}
else
{
player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~ Überwiesen.");
player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~Überwiesen.");
player.GetUser(dbContext).Faction.BankAccount.Balance -= (int)(amount * 1.05);
target.GetUser(dbContext).otheramount = amount;
dbContext.SaveChanges();

4
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -1854,7 +1854,7 @@ namespace ReallifeGamemode.Server.Commands
var user = target.GetUser(context);
user.Handmoney = amount;
context.SaveChanges();
target.TriggerEvent("SERVER:SET_HANDMONEY", amount);
//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.");
@@ -1880,7 +1880,7 @@ namespace ReallifeGamemode.Server.Commands
var user = target.GetUser(context);
user.Handmoney += amount;
context.SaveChanges();
target.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
//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.");

4
ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
View File

@@ -125,7 +125,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{
User payer = client.GetUser(dbContext);
payer.Handmoney -= 2500;
client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
// client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
dbContext.SaveChanges();
}
@@ -221,7 +221,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{
User payer = client.GetUser(dbContext);
payer.Handmoney -= 3500;
client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
// client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
dbContext.SaveChanges();
}

2
ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
View File

@@ -81,7 +81,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{
User payer = client.GetUser(dbContext);
payer.Handmoney -= 5000;
client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
//client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
dbContext.SaveChanges();
}

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

@@ -280,7 +280,7 @@ namespace ReallifeGamemode.Server.Events
}
client.GetUser(dbContext).Handmoney -= data[6];
dbContext.SaveChanges();
client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
//client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
}
client.TriggerEvent("clothesMenu:updateLast", data[2], data[1], data[4], data[5], data[3]);
}

2
ReallifeGamemode.Server/Managers/InventoryManager.cs
View File

@@ -609,7 +609,7 @@ namespace ReallifeGamemode.Server.Managers
}
user.Handmoney -= shopItem.Price;
dbContext.SaveChanges();
client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
//client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
}
}
}