fix faction bank as zivi

This commit is contained in:
hydrant
2021-04-11 15:58:58 +02:00
parent c84e3bf6f3
commit 110107f27c
2 changed files with 12 additions and 6 deletions

View File

@@ -137,9 +137,11 @@ export default function bankMenuHandle(globalData: IGlobalData) {
mp.events.add('removeFactionBankmenu', () => { mp.events.add('removeFactionBankmenu', () => {
mp.gui.cursor.show(false, false); if (globalData.InMenu && factionBankmenu) {
factionBankmenu.Close(true); mp.gui.cursor.show(false, false);
globalData.InMenu = false; factionBankmenu.Close(true);
globalData.InMenu = false;
}
}); });

View File

@@ -5,6 +5,7 @@
*/ */
using GTANetworkAPI; using GTANetworkAPI;
using Newtonsoft.Json; using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Finance; using ReallifeGamemode.Server.Finance;
@@ -60,11 +61,14 @@ namespace ReallifeGamemode.Server.Bank
{ {
if (client.IsInVehicle || !client.IsLoggedIn() || client.GetUser().FactionId is null) return; if (client.IsInVehicle || !client.IsLoggedIn() || client.GetUser().FactionId is null) return;
if (client.GetUser().FactionLeader == true) User user = client.GetUser();
if (user.FactionLeader == true)
{ {
client.TriggerEvent("showFactionBankMenuLeader", client.GetUser().Faction.BankAccount.Balance.ToString()); client.TriggerEvent("showFactionBankMenuLeader", user.Faction.BankAccount.Balance.ToString());
return;
} }
client.TriggerEvent("showFactionBankMenu", client.GetUser().Faction.BankAccount.Balance.ToString()); client.TriggerEvent("showFactionBankMenu", user.Faction.BankAccount.Balance.ToString());
} }
private static void EntityExitFactionBankColShape(ColShape colShape, Player client) private static void EntityExitFactionBankColShape(ColShape colShape, Player client)