From 60f1cc864d03d26a19c50997f3a8244caacc2a06 Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 4 May 2021 19:19:24 +0200 Subject: [PATCH] notification waypoint --- ReallifeGamemode.Client/util/waypoint.ts | 7 ++++--- ReallifeGamemode.Server/Events/Waypoint.cs | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Client/util/waypoint.ts b/ReallifeGamemode.Client/util/waypoint.ts index a2438e4b..b8c5b06c 100644 --- a/ReallifeGamemode.Client/util/waypoint.ts +++ b/ReallifeGamemode.Client/util/waypoint.ts @@ -3,6 +3,7 @@ let x_saved: number; let y_saved: number; let z_saved: number; + let waypointSet: boolean; mp.events.add("SERVER:Util_setWaypoint", (x, y, z) => { mp.game.ui.setNewWaypoint(x, y); @@ -12,11 +13,11 @@ x_saved = position.x; y_saved = position.y; z_saved = position.z; + waypointSet = true; mp.events.callRemote("SERVER:waypointToDriver", position.x, position.y); }); - mp.events.add("gotoWaypoint", () => { - mp.gui.chat.push("xyz: " + x_saved + " " + y_saved + " " + z_saved); - mp.players.local.position = new mp.Vector3(x_saved, y_saved, z_saved); + mp.events.add("playerRemoveWaypoint", () => { + waypointSet = false; }); } \ No newline at end of file diff --git a/ReallifeGamemode.Server/Events/Waypoint.cs b/ReallifeGamemode.Server/Events/Waypoint.cs index 6821d37a..a8a0cf07 100644 --- a/ReallifeGamemode.Server/Events/Waypoint.cs +++ b/ReallifeGamemode.Server/Events/Waypoint.cs @@ -26,13 +26,14 @@ namespace ReallifeGamemode.Server.Events Entity entity = NAPI.Vehicle.GetVehicleDriver(player.Vehicle); Player driver = PlayerService.GetPlayerByNameOrId(entity.Value.ToString()); - if (driver == null) + if (driver == null || entity == null) { return; } driver.TriggerEvent("SERVER:Util_setWaypoint", x, y); - driver.SendNotification(player.Name + " hat dir einen Waypoint gesetzt"); + driver.SendNotification(player.Name + " hat dir eine Markierung auf der Karte gesetzt"); + player.SendNotification("Du hast " + driver.Name + " eine Markierung auf der Karte gesetzt"); } } }