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

try fix interactionmenu close

Browse Source
This commit is contained in:
Michael
2020-06-02 15:06:11 +02:00
parent 32540c4aa9
commit 9a3af81079
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Client/Interaction/interactionmenu.ts
View File

@@ -161,7 +161,6 @@ export default function (globalData: IGlobalData) {
input.show(); input.show();
input.getValue(name => { input.getValue(name => {
mp.events.call("CLIENT:InteractionMenu_Pay_Name", name); mp.events.call("CLIENT:InteractionMenu_Pay_Name", name);
menu.Close(true);
mp.gui.cursor.show(false, false); 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 { function getVehiclesMenu2(vehicles: VehicleData[], eventName: string, allowSell: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu {
var desc = ""; var desc = "Verkaufen";
if (allowSell) { if (allowSell) {
desc += " Verkaufen"; desc;
} }
var menu = new Menu("Fahrzeuge", desc, new Point(50, 50), null, null); var menu = new Menu("Fahrzeuge", desc, new Point(50, 50), null, null);
@@ -524,6 +523,7 @@ export default function (globalData: IGlobalData) {
input.getValue(amount => { input.getValue(amount => {
mp.events.callRemote("CLIENT:InteractionMenu_Pay", JSON.stringify(payName), amount); mp.events.callRemote("CLIENT:InteractionMenu_Pay", JSON.stringify(payName), amount);
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
}); });
}); });
} }

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

@@ -165,7 +165,7 @@ namespace ReallifeGamemode.Server.Events
nextPayday = u.PaydayTimer nextPayday = u.PaydayTimer
}; };
string faction = u.Faction.Name; string faction = u.Faction?.Name;
string factionleader = u.FactionLeader ? u.Faction.Name : null; string factionleader = u.FactionLeader ? u.Faction.Name : null;
string group = u.Group != null && u.GroupRank >= GroupRank.MANAGER ? u.Group.Name : null; string group = u.Group != null && u.GroupRank >= GroupRank.MANAGER ? u.Group.Name : null;
bool factionInvite = player.HasData("accept_faction_invite"); bool factionInvite = player.HasData("accept_faction_invite");