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

try pay when player is nearby target

Browse Source
This commit is contained in:
Michael
2020-06-06 12:28:30 +02:00
parent 9f52b2b559
commit 3e79992a33
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
@@ -456,7 +456,7 @@ export default function (globalData: IGlobalData) {
}
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();

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

@@ -184,8 +184,9 @@ namespace ReallifeGamemode.Server.Events
pay_amount = player.GetData<int>("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)

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

@@ -611,6 +611,8 @@ namespace ReallifeGamemode.Server.Managers
int amount = Int32.Parse(stringAmount);
Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
List<Player> 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);