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

Refresh TicketSystem

Browse Source
This commit is contained in:
Mac_Slash
2020-04-11 15:30:31 +02:00
parent b33a2b2bb6
commit 579fbc2e0a
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,9 @@ export default function (globalData: IGlobalData) {
var ticketItem = new UIMenuItem("Strafticket", "Strafticket annehmen/ablehnen"); var ticketItem = new UIMenuItem("Strafticket", "Strafticket annehmen/ablehnen");
mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount: number) => { mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amountJson: string) => {
var accountData: AccountData = JSON.parse(accountDataJson); var accountData: AccountData = JSON.parse(accountDataJson);
var ticket_amount = JSON.parse(ticket_amountJson);
var menu = getInteractionMenu(); var menu = getInteractionMenu();

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

@@ -149,7 +149,7 @@ namespace ReallifeGamemode.Server.Events
bool ticket_boolean = player.HasData("ticket_boolean"); bool ticket_boolean = player.HasData("ticket_boolean");
int ticket_amount = NAPI.Data.GetEntityData(player, "ticket_amount"); int ticket_amount = NAPI.Data.GetEntityData(player, "ticket_amount");
player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount); player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), faction, group, factionInvite, groupInvite, ticket_boolean, JsonConvert.SerializeObject(ticket_amount));
} }
[RemoteEvent("keyPress:E")] [RemoteEvent("keyPress:E")]

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

@@ -387,7 +387,7 @@ namespace ReallifeGamemode.Server.Managers
} }
else if (target == player) else if (target == player)
{ {
player.SendNotification("~r~Du kannst dir selbst keine Punkte setzen!"); player.SendNotification("~r~Du kannst dir selbst kein Ticket geben!");
} }
else else
{ {