diff --git a/ReallifeGamemode.Client/util/checkpoint.ts b/ReallifeGamemode.Client/util/checkpoint.ts index 6e44d3af..5939c73c 100644 --- a/ReallifeGamemode.Client/util/checkpoint.ts +++ b/ReallifeGamemode.Client/util/checkpoint.ts @@ -56,6 +56,12 @@ export default function checkpointHandle(globalData: GlobalData) { } }); + mp.events.add('getCP', () => { + var pos = posCp; + mp.events.callRemote("sendCP", posCp.x, posCp.y, posCp.z); + }); + + function myTimer() { let dist = mp.game.gameplay.getDistanceBetweenCoords(Player.position.x, Player.position.y, 0, posCp.x, posCp.y, 0, false); //mp.gui.chat.push("delay: " + delay + " | delayCounter: " + delayCounter); diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 0a082ba6..88db8863 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -1261,6 +1261,20 @@ namespace ReallifeGamemode.Server.Commands } #endregion #region ALevel1337 + [Command("gotocp", "~m~Benutzung: ~s~/sethandmoney [Target] [Geld]")] + public void CmdAdminGotocp(Client admin) + { + admin.TriggerEvent("getCP"); + + } + + [RemoteEvent("sendCP")] + public void sendCPfunc(Client user, int x, int y, int z) + { + Vector3 pos = new Vector3(x, y, z); + user.Position = pos; + } + [Command("sethandmoney", "~m~Benutzung: ~s~/sethandmoney [Target] [Geld]")] public void CmdAdminSetUserHandMoney(Client admin, string targetname, int amount) { diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs index c1c6ed3d..4bbd90f7 100644 --- a/ReallifeGamemode.Server/Job/BusDriverJob.cs +++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs @@ -73,23 +73,23 @@ namespace ReallifeGamemode.Server.Job private readonly IReadOnlyCollection RouteVeryLong = new List { - new Vector3(-562.68, -2203.85, 5.72), - new Vector3(-889.0892, -2190.34, 7.100273), - new Vector3(-695.8978, -1197.1, 9.07723), - new Vector3(-1025.791, -788.746, 15.95118), - new Vector3(-1411.543, -569.5651, 28.83663), - new Vector3(-1863.717, -355.0997, 47.79111), - new Vector3(-2171.938, -299.1247, 11.24473), - new Vector3(-2973.008, 506.4566, 13.99877), - new Vector3(-2738.997, 2239.153, 20.54851), - new Vector3(-2448.411, 3736.997, 15.20646), - new Vector3(-2206.853, 4257.991, 46.13944), - new Vector3(-1545.054, 4934.076, 60.29264), - new Vector3(-152.66, 6209.62, 31.03), - new Vector3(2707.136, 3309.894, 54.37453), - new Vector3(2554.981, 292.5191, 107.036), - new Vector3(-740.3124, -1645.125, 25.10983), - new Vector3(-756.3812, -2295.088, 11.43381), + new Vector3(-562.68, -2203.85, 6.72), + new Vector3(-889.0892, -2190.34, 8.100273), + new Vector3(-695.8978, -1197.1, 10.07723), + new Vector3(-1025.791, -788.746, 16.95118), + new Vector3(-1411.543, -569.5651, 29.83663), + new Vector3(-1863.717, -355.0997, 48.79111), + new Vector3(-2171.938, -299.1247, 12.24473), + new Vector3(-2973.008, 506.4566, 14.99877), + new Vector3(-2738.997, 2239.153, 21.54851), + new Vector3(-2448.411, 3736.997, 16.20646), + new Vector3(-2206.853, 4257.991, 47.13944), + new Vector3(-1545.054, 4934.076, 61.29264), + new Vector3(-152.66, 6209.62, 32.03), + new Vector3(2707.136, 3309.894, 55.37453), + new Vector3(2554.981, 292.5191, 108.036), + new Vector3(-740.3124, -1645.125, 26.10983), + new Vector3(-756.3812, -2295.088, 12.43381), }.AsReadOnly(); public BusDriverJob()