diff --git a/ReallifeGamemode.Client/Interaction/bankmenu.ts b/ReallifeGamemode.Client/Interaction/bankmenu.ts index 791c9899..b886c0a6 100644 --- a/ReallifeGamemode.Client/Interaction/bankmenu.ts +++ b/ReallifeGamemode.Client/Interaction/bankmenu.ts @@ -137,9 +137,11 @@ export default function bankMenuHandle(globalData: IGlobalData) { mp.events.add('removeFactionBankmenu', () => { - mp.gui.cursor.show(false, false); - factionBankmenu.Close(true); - globalData.InMenu = false; + if (globalData.InMenu && factionBankmenu) { + mp.gui.cursor.show(false, false); + factionBankmenu.Close(true); + globalData.InMenu = false; + } }); diff --git a/ReallifeGamemode.Server/Bank/bank.cs b/ReallifeGamemode.Server/Bank/bank.cs index 47d9aca4..1781103e 100644 --- a/ReallifeGamemode.Server/Bank/bank.cs +++ b/ReallifeGamemode.Server/Bank/bank.cs @@ -5,6 +5,7 @@ */ using GTANetworkAPI; using Newtonsoft.Json; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; 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.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)