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

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
hydrant
2018-10-21 00:00:38 +02:00
parent 723e58d890 e10377056f
commit cd24928da3
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Server/Commands/Admin.cs
View File

@@ -1082,23 +1082,26 @@ namespace reallife_gamemode.Server.Commands
if (playerHeading < 45 || playerHeading >= 315) if (playerHeading < 45 || playerHeading >= 315)
{ {
Vector3 playerPosition = new Vector3(player.Position.X + value, player.Position.Y, player.Position.Z); 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) else if (playerHeading < 315 && playerHeading >= 225)
{ {
Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z); 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) else if (playerHeading >= 135 && playerHeading < 225)
{ {
Vector3 playerPosition = new Vector3(player.Position.X - value, player.Position.Y, player.Position.Z); 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) else if (playerHeading >= 45 && playerHeading < 135)
{ {
Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y + value, player.Position.Z); 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) if (playerHeading < 45 || playerHeading >= 315)
{ {
Vector3 playerPosition = new Vector3(player.Position.X - value, player.Position.Y, player.Position.Z); 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) else if (playerHeading < 315 && playerHeading >= 225)
{ {
Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y + value, player.Position.Z); 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) else if (playerHeading >= 135 && playerHeading < 225)
{ {
Vector3 playerPosition = new Vector3(player.Position.X + value, player.Position.Y, player.Position.Z); 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) else if (playerHeading >= 45 && playerHeading < 135)
{ {
Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z); 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;
} }
} }
@@ -1347,7 +1353,8 @@ namespace reallife_gamemode.Server.Commands
return; 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]")] [Command("getincar", "~m~Benutzung: ~s~/getincar [Name]")]