From e10377056f0cf07eff3c5d668ee4b2e1adad236a Mon Sep 17 00:00:00 2001 From: xSprite Date: Sat, 20 Oct 2018 23:50:23 +0200 Subject: [PATCH] vehicle port on /gotomark, /lt, /rt --- Server/Commands/Admin.cs | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 841346ef..7b06a96c 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -1082,23 +1082,26 @@ namespace reallife_gamemode.Server.Commands if (playerHeading < 45 || playerHeading >= 315) { Vector3 playerPosition = new Vector3(player.Position.X + value, player.Position.Y, player.Position.Z); - player.Position = playerPosition; - + if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + else player.Position = playerPosition; } else if (playerHeading < 315 && playerHeading >= 225) { Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z); - player.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + else player.Position = playerPosition; } else if (playerHeading >= 135 && playerHeading < 225) { Vector3 playerPosition = new Vector3(player.Position.X - value, player.Position.Y, player.Position.Z); - player.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + else player.Position = playerPosition; } else if (playerHeading >= 45 && playerHeading < 135) { Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y + value, player.Position.Z); - player.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + else player.Position = playerPosition; } } @@ -1116,23 +1119,26 @@ namespace reallife_gamemode.Server.Commands if (playerHeading < 45 || playerHeading >= 315) { Vector3 playerPosition = new Vector3(player.Position.X - value, player.Position.Y, player.Position.Z); - player.Position = playerPosition; - + if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + else player.Position = playerPosition; } else if (playerHeading < 315 && playerHeading >= 225) { Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y + value, player.Position.Z); - player.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + else player.Position = playerPosition; } else if (playerHeading >= 135 && playerHeading < 225) { Vector3 playerPosition = new Vector3(player.Position.X + value, player.Position.Y, player.Position.Z); - player.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + else player.Position = playerPosition; } else if (playerHeading >= 45 && playerHeading < 135) { Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z); - player.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + else player.Position = playerPosition; } } @@ -1343,7 +1349,8 @@ namespace reallife_gamemode.Server.Commands return; } - player.Position = player.GetData("mark"); + if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = player.GetData("mark"); + else player.Position = player.GetData("mark"); } [Command("getincar", "~m~Benutzung: ~s~/getincar [Name]")]