diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index d4ee3795..c92a338e 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -33,8 +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_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 ticket_amount = JSON.parse(ticket_amountJson); var menu = getInteractionMenu(); diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index e04e9a1c..39c6c648 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, ticket_amount); + player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), faction, group, factionInvite, groupInvite, ticket_boolean, JsonConvert.SerializeObject(ticket_amount)); } [RemoteEvent("keyPress:E")] diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 7101fa6e..9b340806 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -387,7 +387,7 @@ namespace ReallifeGamemode.Server.Managers } 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 {