From 3e79992a33078f18f930222cc03aff4d43613685 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 6 Jun 2020 12:28:30 +0200 Subject: [PATCH] try pay when player is nearby target --- ReallifeGamemode.Client/Interaction/interactionmenu.ts | 6 +++--- ReallifeGamemode.Server/Events/Key.cs | 5 +++-- ReallifeGamemode.Server/Managers/InteractionManager.cs | 6 ++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index 5c752e4c..2e3c5561 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -37,7 +37,7 @@ export default function (globalData: IGlobalData) { var payName: string; - mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, factionleader: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount, pay_amount) => { + mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, factionleader: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount, pay_amount, payName: [] ) => { var accountData: AccountData = JSON.parse(accountDataJson); @@ -454,9 +454,9 @@ export default function (globalData: IGlobalData) { return ticketMenu; } - + mp.events.add("CLIENT:InteractionMenu_Pay_Name", (name) => { - payName = name; + payName = JSON.parse(name); var input = new InputHelper("Wie viel?", globalData); mp.gui.cursor.show(true, true); input.show(); diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index e645ce06..0dba8dc0 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -184,8 +184,9 @@ namespace ReallifeGamemode.Server.Events pay_amount = player.GetData("pay_amount"); } - player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), factionleader, faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount, pay_amount); - } + player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), factionleader, faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount, pay_amount); + + } [RemoteEvent("keyPress:E")] public void KeyPressE(Player player) diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 61a36e97..9fab4d11 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -611,6 +611,8 @@ namespace ReallifeGamemode.Server.Managers int amount = Int32.Parse(stringAmount); Player target = PlayerService.GetPlayerByNameOrId(nameOrId); + List nearbyPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(3, player); + if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -620,6 +622,10 @@ namespace ReallifeGamemode.Server.Managers { player.SendNotification("~r~Du kannst dir selber kein Geld geben!"); } + else if(!nearbyPlayers.Contains(target)) + { + player.SendNotification("~r~Dieser Spieler befindet sich nicht in deiner nähe!"); + } else { string playername = NAPI.Player.GetPlayerName(player);