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

Tickets nun serverweit ausstellbar

Browse Source
This commit is contained in:
Luke
2021-06-01 23:29:46 +02:00
parent 0077cabced
commit f076f9084a
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -155,7 +155,7 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.events.add("CLIENT:InteractionMenu_LSPD_Ticket2", (ticketPrice) => { mp.events.add("CLIENT:InteractionMenu_LSPD_Ticket2", (ticketPrice) => {
globalData.InMenu = true; globalData.InMenu = true;
var input = new InputHelper("Um welches Vergehen handelt es sich ?", globalData); var input = new InputHelper("Um welches Vergehen handelt es sich?", globalData);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
input.show(); input.show();
input.getValue(ticketReason => { input.getValue(ticketReason => {

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

@@ -593,8 +593,6 @@ namespace ReallifeGamemode.Server.Managers
string playername = NAPI.Player.GetPlayerName(player); string playername = NAPI.Player.GetPlayerName(player);
string targetname = NAPI.Player.GetPlayerName(target); string targetname = NAPI.Player.GetPlayerName(target);
List<Player> nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(10, player);
if (target == null || !target.IsLoggedIn()) if (target == null || !target.IsLoggedIn())
{ {
ChatService.PlayerNotFound(player); ChatService.PlayerNotFound(player);
@@ -604,25 +602,20 @@ namespace ReallifeGamemode.Server.Managers
{ {
player.SendNotification("~r~Du kannst dir selbst kein Ticket geben!"); player.SendNotification("~r~Du kannst dir selbst kein Ticket geben!");
} }
else if (!nearPlayers.Contains(target))
{
player.SendNotification("~r~Der Spieler ist nicht in deiner Nähe!");
}
else else
{ {
if (amount > 0 && amount <= 10000) if (amount <= 0 || amount > 10000)
{
player.SendNotification($"~w~Du hast ~y~{targetname} ~w~ein Ticket in Höhe von ~b~{amount.ToMoneyString()} ~w~ausgestellt (Grund: ~g~{reason}~w~).");
target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount.ToMoneyString()} ~w~ausgestellt.", true);
target.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Das Ticket kann im Interaktionsmenü angenommen werden.", true);
target.SetData("ticket_boolean", true);
target.SetData<int>("ticket_amount", amount);
target.SetData<Player>("ticket_player", player);
}
else
{ {
player.SendNotification("~r~Du kannst nur einen Betrag zwischen $1 und $10.000 angeben!"); player.SendNotification("~r~Du kannst nur einen Betrag zwischen $1 und $10.000 angeben!");
return;
} }
player.SendNotification($"~w~Du hast ~y~{targetname} ~w~ein Ticket in Höhe von ~b~{amount.ToMoneyString()} ~w~ausgestellt (Grund: ~g~{reason}~w~).");
target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount.ToMoneyString()} ~w~ausgestellt.", true);
target.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Das Ticket kann im Interaktionsmenü angenommen werden.", true);
target.SetData("ticket_boolean", true);
target.SetData<int>("ticket_amount", amount);
target.SetData<Player>("ticket_player", player);
} }
} }