Respawn vehicle on getveh, dont teleport

This commit is contained in:
Vortrex
2023-02-25 04:43:18 -06:00
parent a388d94244
commit 9205f07dbe

View File

@@ -393,24 +393,37 @@ function getVehicleCommand(command, params, client) {
return false; return false;
} }
if (typeof getServerData().vehicles[toInteger(params) - 1] == "undefined") { let vehicleIndex = toInteger(params);
if (getVehicleData(vehicleIndex)) {
messagePlayerError(client, "That vehicle ID doesn't exist!"); messagePlayerError(client, "That vehicle ID doesn't exist!");
} }
let vehicle = getServerData().vehicles[toInteger(params) - 1].vehicle; destroyGameElement(getVehicleData(vehicleIndex).vehicle);
getVehicleData(vehicleIndex).vehicle = null;
let oldStreamInDistance = getElementStreamInDistance(vehicle); getVehicleData(vehicleIndex).spawnPosition = getPlayerPosition(client);
let oldStreamOutDistance = getElementStreamOutDistance(vehicle); getVehicleData(vehicleIndex).spawnRotation = getPlayerHeading(client);
setElementStreamInDistance(vehicle, 9999999); //let oldStreamInDistance = getElementStreamInDistance(vehicle);
setElementStreamOutDistance(vehicle, 9999999 + 1); //let oldStreamOutDistance = getElementStreamOutDistance(vehicle);
setElementPosition(vehicle, getPosInFrontOfPos(getPlayerPosition(client), fixAngle(getPlayerHeading(client)), 5.0)); //setElementStreamInDistance(vehicle, 9999999);
setElementInterior(vehicle, getPlayerInterior(client)); //setElementStreamOutDistance(vehicle, 9999999 + 1);
setElementDimension(vehicle, getPlayerDimension(client));
setElementStreamInDistance(vehicle, oldStreamInDistance); //setElementPosition(vehicle, getPosInFrontOfPos(getPlayerPosition(client), fixAngle(getPlayerHeading(client)), 5.0));
setElementStreamOutDistance(vehicle, oldStreamOutDistance); //setElementInterior(vehicle, getPlayerInterior(client));
//setElementDimension(vehicle, getPlayerDimension(client));
//setElementStreamInDistance(vehicle, oldStreamInDistance);
//setElementStreamOutDistance(vehicle, oldStreamOutDistance);
spawnVehicle(getVehicleData(vehicleIndex));
if (getVehicleData(vehicleIndex).vehicle == null) {
messagePlayerError(client, "Vehicle could not be retrieved!");
return false;
}
messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} teleported a {vehiclePurple}${getVehicleName(vehicle)}{ALTCOLOUR} (ID ${vehicle.id}){MAINCOLOUR} to their position`, true); messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} teleported a {vehiclePurple}${getVehicleName(vehicle)}{ALTCOLOUR} (ID ${vehicle.id}){MAINCOLOUR} to their position`, true);
} }