diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index 1f1643cc..8e589257 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -27,7 +27,7 @@ export default function (globalData: GlobalData) { var paycheckItem = new UIMenuItem("Gehaltsscheck", "Schaue dir deinen Verdienst der letzten Stunde an"); - var licenseItem = new UIMenuItem("Lizensen", "Lizensen Informationen"); + var licenseItem = new UIMenuItem("Lizenzen", "Lizenzen Informationen"); mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean) => { @@ -155,7 +155,7 @@ export default function (globalData: GlobalData) { } function getLicenseMenu(data: Licenses, parentMenu: NativeUI.Menu): NativeUI.Menu { - var licenseMenu = new NativeUI.Menu("Lizensen", mp.players.local.name, new Point(50, 50), null, null); + var licenseMenu = new NativeUI.Menu("Lizenzen", mp.players.local.name, new Point(50, 50), null, null); var menuItem = new UIMenuItem("Auto Führerschein"); if (data.drivingLicenseCar == false) { @@ -181,13 +181,13 @@ export default function (globalData: GlobalData) { } licenseMenu.AddItem(menuItem); - licenseMenu.AddItem(new UIMenuItem("Lizensen an Spieler zeigen")); + licenseMenu.AddItem(new UIMenuItem("Lizenzen an Spieler zeigen")); licenseMenu.Visible = false; licenseMenu.ItemSelect.on((item, index) => { if (index === 3) { - var input = new InputHelper("Welchen Spieler möchtest du deine Lizensen zeigen (Name / ID)?", globalData); + var input = new InputHelper("Welchen Spieler möchtest du deine Lizenzen zeigen (Name / ID)?", globalData); input.show(); input.getValue(name => { mp.events.callRemote("CLIENT:InteractionMenu_Show", "License", name); diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 977cebf8..265e27df 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -125,17 +125,15 @@ namespace ReallifeGamemode.Server.Managers { if (!playerUser.DriverLicenseBike && !playerUser.DriverLicenseVehicle && !playerUser.FlyingLicensePlane) { - ChatService.ErrorMessage(player, "Sie besitzen keine Scheine"); + player.SendNotification("~r~Sie besitzen keine Scheine!"); return; } - if (player.Position.DistanceTo(target.Position) > 5) - { - ChatService.ErrorMessage(player, "Spieler zu weit entfernt"); + if (player.Position.DistanceTo(target.Position) > 5) return; - } + if (target.HasData("ShowActive")) { - ChatService.ErrorMessage(player, "Spieler ist beschäftigt"); + player.SendNotification("Spieler ist beschäftigt."); return; } target.SetData("ShowActive", true);