From 3ef187d7ddb413a10819d601341d48f1c77614ed Mon Sep 17 00:00:00 2001 From: VortrexFTW Date: Tue, 8 Sep 2020 22:05:54 -0500 Subject: [PATCH] Fix create veh func --- scripts/server/vehicle.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js index 44c2e860..e3124168 100644 --- a/scripts/server/vehicle.js +++ b/scripts/server/vehicle.js @@ -153,19 +153,22 @@ function createVehicleCommand(command, params, client) { return false; } - let modelId = getVehicleModelIDFromParams(params); + let modelId = getVehicleModelIdFromParams(params); if(!modelId) { messageClientError(client, "That vehicle type is invalid!"); return false; } - let frontPos = getPosInFrontOfPos(client.player.position, client.player.heading, s) - let vehicle = createVehicle(frontPos, client.player.heading); + let frontPos = getPosInFrontOfPos(client.player.position, client.player.heading, serverConfig.spawnCarDistance); + + let vehicle = createVehicle(modelId, frontPos, client.player.heading); + let tempVehicleData = new serverClasses.vehicleData(false, vehicle); let vehiclesLength = serverData.vehicles.push(tempVehicleData); vehicle.setData("ag.dataSlot", vehiclesLength-1, false); - messageClientSuccess(client, "You created a ", getVehicleName(vehicle)); + + messageClientSuccess(client, `You created a ${getVehicleName(vehicle)}!`); } // --------------------------------------------------------------------------- @@ -316,7 +319,7 @@ function vehicleEngineCommand(command, params, client) { } let engineText = (getVehicleData(vehicle).engine) ? "on" : "off"; - meActionToNearbyPlayers(client, "turned the " + String(getVehicleName(vehicle)) + "'s engine " + engineText); + meActionToNearbyPlayers(client, `turned the ${getVehicleName(vehicle)}'s engine ${engineText}`); } // --------------------------------------------------------------------------- @@ -364,7 +367,7 @@ function vehicleSirenCommand(command, params, client) { } let sirenText = (getVehicleData(vehicle).siren) ? "on" : "off"; - meActionToNearbyPlayers(client, "turns the " + String(getVehicleName(vehicle)) + "'s siren " + sirenText); + meActionToNearbyPlayers(client, `turns the ${getVehicleName(vehicle)}'s siren ${sirenText}`); } // --------------------------------------------------------------------------- @@ -414,7 +417,8 @@ function doesClientHaveVehicleKeys(client, vehicle) { // --------------------------------------------------------------------------- function getVehicleName(vehicle) { - return getVehicleNameFromModelID(vehicle.modelIndex, server.game); + let vehicleName = getVehicleNameFromModelId(vehicle.modelIndex); + return vehicleName; } // --------------------------------------------------------------------------- \ No newline at end of file