From e0104bb9b2611a82b16f3728659f33f30b613256 Mon Sep 17 00:00:00 2001 From: Mac_Slash Date: Sat, 11 Apr 2020 15:40:34 +0200 Subject: [PATCH] Refresh TicketSystem --- ReallifeGamemode.Client/Interaction/interactionmenu.ts | 4 ++-- ReallifeGamemode.Server/Events/Key.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index c92a338e..164df5dd 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -33,9 +33,9 @@ export default function (globalData: IGlobalData) { 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_amountJson: string) => { + mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount) => { var accountData: AccountData = JSON.parse(accountDataJson); - var ticket_amount = JSON.parse(ticket_amountJson); + //var ticket_amount = JSON.parse(ticket_amountJson); var menu = getInteractionMenu(); diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 39c6c648..e04e9a1c 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -149,7 +149,7 @@ namespace ReallifeGamemode.Server.Events bool ticket_boolean = player.HasData("ticket_boolean"); int ticket_amount = NAPI.Data.GetEntityData(player, "ticket_amount"); - player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), faction, group, factionInvite, groupInvite, ticket_boolean, JsonConvert.SerializeObject(ticket_amount)); + player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount); } [RemoteEvent("keyPress:E")]