diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts index 246f0fb5..5a4f496a 100644 --- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts +++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts @@ -130,7 +130,7 @@ export default function factionInteraction(globalData: IGlobalData) { mp.gui.cursor.show(true, true); input.show(); input.getValue(ticketReason => { - mp.events.callRemote("CLIENT:InteractionMenu_LSPD_Ticket3", JSON.stringify(ticketName), JSON.stringify(ticketPrice), JSON.stringify(ticketReason)); + mp.events.callRemote("CLIENT:InteractionMenu_LSPD_Ticket3", JSON.stringify(ticketName), ticketPrice, JSON.stringify(ticketReason)); mp.gui.cursor.show(false, false); }); }); diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index 164df5dd..7bcba91c 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -34,6 +34,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) => { + + mp.game.graphics.notify("" + ticket_amount); + var accountData: AccountData = JSON.parse(accountDataJson); //var ticket_amount = JSON.parse(ticket_amountJson); diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index e04e9a1c..73334eb9 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -147,7 +147,12 @@ namespace ReallifeGamemode.Server.Events bool factionInvite = player.HasData("accept_faction_invite"); bool groupInvite = player.HasData("accept_group_invite"); bool ticket_boolean = player.HasData("ticket_boolean"); - int ticket_amount = NAPI.Data.GetEntityData(player, "ticket_amount"); + int ticket_amount; + if (player.HasData("ticket_amount")) + { + ticket_amount = player.GetData("ticket_amount"); + } + else return; player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount); } diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 9b340806..e5756cd8 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -372,10 +372,10 @@ namespace ReallifeGamemode.Server.Managers } } [RemoteEvent("CLIENT:InteractionMenu_LSPD_Ticket3")] - public void InteractionMenu_LSPD_Ticket3(Player player, string jsonNameOrId, string jsoAmount, string jsonReason) + public void InteractionMenu_LSPD_Ticket3(Player player, string jsonNameOrId, string stringAmount, string jsonReason) { string nameOrId = (string)JsonConvert.DeserializeObject(jsonNameOrId); - int amount = Int32.Parse((string)JsonConvert.DeserializeObject(jsoAmount)); + int amount = Int32.Parse(stringAmount); string reason = (string)JsonConvert.DeserializeObject(jsonReason); Player target = PlayerService.GetPlayerByNameOrId(nameOrId); string playername = NAPI.Player.GetPlayerName(player); @@ -397,8 +397,8 @@ namespace ReallifeGamemode.Server.Managers target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount}$ ~w~gestellt.", true); target.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Strafticket im Interaktionsmenü annehmen.", true); target.SetData("ticket_boolean", true); - NAPI.Data.SetEntityData(target, "ticket_amount", amount); - NAPI.Data.SetEntityData(target, "ticket_player", player); + target.SetData("ticket_amount", amount); + target.SetData("ticket_player", player); } else {