diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index 4b5b0d0c..0cb6993e 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -161,7 +161,6 @@ export default function (globalData: IGlobalData) { input.show(); input.getValue(name => { mp.events.call("CLIENT:InteractionMenu_Pay_Name", name); - menu.Close(true); mp.gui.cursor.show(false, false); }); } @@ -409,9 +408,9 @@ export default function (globalData: IGlobalData) { } function getVehiclesMenu2(vehicles: VehicleData[], eventName: string, allowSell: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu { - var desc = ""; + var desc = "Verkaufen"; if (allowSell) { - desc += " Verkaufen"; + desc; } var menu = new Menu("Fahrzeuge", desc, new Point(50, 50), null, null); @@ -524,6 +523,7 @@ export default function (globalData: IGlobalData) { input.getValue(amount => { mp.events.callRemote("CLIENT:InteractionMenu_Pay", JSON.stringify(payName), amount); mp.gui.cursor.show(false, false); + }); }); } diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 87299a44..e645ce06 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -165,7 +165,7 @@ namespace ReallifeGamemode.Server.Events nextPayday = u.PaydayTimer }; - string faction = u.Faction.Name; + string faction = u.Faction?.Name; string factionleader = u.FactionLeader ? u.Faction.Name : null; string group = u.Group != null && u.GroupRank >= GroupRank.MANAGER ? u.Group.Name : null; bool factionInvite = player.HasData("accept_faction_invite");