diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js index 0931e5d9..03fee580 100644 --- a/scripts/server/vehicle.js +++ b/scripts/server/vehicle.js @@ -713,6 +713,11 @@ function setVehicleJobCommand(command, params, client) { let vehicle = getPlayerVehicle(client); + if(!getVehicleData(vehicle)) { + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); + return false; + } + let closestJobLocation = getClosestJobLocation(getVehiclePosition(vehicle)); let jobId = closestJobLocation.job; @@ -748,9 +753,13 @@ function setVehicleRankCommand(command, params, client) { } let vehicle = getPlayerVehicle(client); - let rankId = params; + if(!getVehicleData(vehicle)) { + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); + return false; + } + if(getVehicleData(vehicle).ownerType == VRR_VEHOWNER_CLAN) { rankId = getClanRankFromParams(getVehicleData(vehicle).ownerId, params); if(!getClanRankData(getVehicleData(vehicle).ownerId, rankId)) { @@ -778,6 +787,11 @@ function setVehicleClanCommand(command, params, client) { let vehicle = getPlayerVehicle(client); let clanId = getPlayerClan(client); + if(!getVehicleData(vehicle)) { + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); + return false; + } + if(!getClanData(clanId)) { messagePlayerError(client, "That clan is invalid or doesn't exist!"); return false; @@ -808,7 +822,17 @@ function setVehicleToBusinessCommand(command, params, client) { } let vehicle = getPlayerVehicle(client); - let businessId = toInteger(isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client)); + let businessId = getPlayerBusiness(client); + + if(!getVehicleData(vehicle)) { + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); + return false; + } + + if(!getBusinessData(businessId)) { + messagePlayerError(client, getLocaleString(client, "InvalidBusiness")); + return false; + } getVehicleData(vehicle).ownerType = VRR_VEHOWNER_BIZ; getVehicleData(vehicle).ownerId = getBusinessData(businessId).databaseId; @@ -829,6 +853,11 @@ function setVehicleOwnerCommand(command, params, client) { let vehicle = getPlayerVehicle(client); let targetClient = getPlayerFromParams(params); + if(!getVehicleData(vehicle)) { + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); + return false; + } + if(!targetClient) { messagePlayerError(client, "That player is invalid or isn't connected!"); return false; @@ -852,6 +881,11 @@ function setVehiclePublicCommand(command, params, client) { let vehicle = getPlayerVehicle(client); + if(!getVehicleData(vehicle)) { + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); + return false; + } + getVehicleData(vehicle).ownerType = VRR_VEHOWNER_PUBLIC; getVehicleData(vehicle).ownerId = 0; @@ -870,6 +904,11 @@ function setVehicleRentPriceCommand(command, params, client) { let vehicle = getPlayerVehicle(client); + if(!getVehicleData(vehicle)) { + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); + return false; + } + if(!doesClientOwnVehicle(client, vehicle)) { if(!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageVehicles"))) { messagePlayerError(client, "You can't set the rent price for this vehicle!"); @@ -894,6 +933,11 @@ function setVehicleBuyPriceCommand(command, params, client) { let vehicle = getPlayerVehicle(client); + if(!getVehicleData(vehicle)) { + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); + return false; + } + if(!doesClientOwnVehicle(client, vehicle)) { if(!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageVehicles"))) { messagePlayerError(client, "You can't set the buy price for this vehicle!"); @@ -919,6 +963,11 @@ function removeVehicleOwnerCommand(command, params, client) { let vehicle = getPlayerVehicle(client); let targetClient = getPlayerFromParams(params); + if(!getVehicleData(vehicle)) { + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); + return false; + } + if(!targetClient) { messagePlayerError(client, "That player is invalid or isn't connected!"); return false; @@ -944,7 +993,7 @@ function getVehicleInfoCommand(command, params, client) { let vehicle = getPlayerVehicle(client); if(!getVehicleData(vehicle)) { - messagePlayerError(client, "This is a random traffic vehicle and doesn't have any info"); + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); return false; } @@ -993,7 +1042,7 @@ function getLastVehicleInfoCommand(command, params, client) { let vehicle = getPlayerLastVehicle(client); if(!getVehicleData(vehicle)) { - messagePlayerError(client, "This is a random traffic vehicle and doesn't have any info"); + messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); return false; }