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

Fix some teleport commands when in car

Browse Source
This commit is contained in:
VegaZ
2020-03-13 21:00:44 +01:00
parent 87fd9cb136
commit f5cd9cfbb5
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -362,7 +362,7 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
if (target.IsInVehicle && target.VehicleSeat == -1) if (target.IsInVehicle && target.VehicleSeat == 0)
{ {
target.Vehicle.Position = player.Position; target.Vehicle.Position = player.Position;
NAPI.Entity.SetEntityVelocity(target.Vehicle, new Vector3()); NAPI.Entity.SetEntityVelocity(target.Vehicle, new Vector3());
@@ -809,7 +809,11 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = new Vector3(p.X, p.Y, p.Z); if (player.IsInVehicle && player.VehicleSeat == 0)
{
player.Vehicle.Position = new Vector3(p.X, p.Y, p.Z);
NAPI.Entity.SetEntityVelocity(player.Vehicle, new Vector3());
}
else player.Position = new Vector3(p.X, p.Y, p.Z); else player.Position = new Vector3(p.X, p.Y, p.Z);
} }
@@ -1223,7 +1227,7 @@ namespace ReallifeGamemode.Server.Commands
Vehicle v = NAPI.Vehicle.CreateVehicle(uHash, player.Position, player.Rotation.Z, color1, color2, engine: true); Vehicle v = NAPI.Vehicle.CreateVehicle(uHash, player.Position, player.Rotation.Z, color1, color2, engine: true);
VehicleStreaming.SetEngineState(v, true); VehicleStreaming.SetEngineState(v, true);
VehicleStreaming.SetLockStatus(v, false); VehicleStreaming.SetLockStatus(v, false);
player.SetIntoVehicle(v.Handle, -1); player.SetIntoVehicle(v.Handle, 0);
} }
[Command("fv", "~m~Benutzung: ~s~/fv", Alias = "vfix")] [Command("fv", "~m~Benutzung: ~s~/fv", Alias = "vfix")]
@@ -2055,7 +2059,7 @@ namespace ReallifeGamemode.Server.Commands
vehicle = SaveManager.SaveJobVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate, vehicle = SaveManager.SaveJobVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus, jobId); vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus, jobId);
player.SendNotification("Jobfahrzeug ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true); player.SendNotification("Jobfahrzeug ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true);
player.SetIntoVehicle(vehicle, -1); player.SetIntoVehicle(vehicle, 0);
} }
} }
else ChatService.SendMessage(player, "~m~Du sitzt in keinem Fahrzeug!"); else ChatService.SendMessage(player, "~m~Du sitzt in keinem Fahrzeug!");
@@ -2122,7 +2126,7 @@ namespace ReallifeGamemode.Server.Commands
vehicle = SaveManager.SaveSchoolVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate, vehicle = SaveManager.SaveSchoolVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus, drivingSchoolId); vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus, drivingSchoolId);
player.SendNotification("Fahrschulauto ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true); player.SendNotification("Fahrschulauto ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true);
player.SetIntoVehicle(vehicle, -1); player.SetIntoVehicle(vehicle, 0);
} }
break; break;