hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vehrespawn cmd + currency string in vehinfo

Browse Source
This commit is contained in:
Vortrex
2022-12-18 15:43:04 -06:00
parent 5b522e3098
commit 0b1662eb46
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/server/vehicle.js
View File

@@ -1245,8 +1245,8 @@ function getVehicleInfoCommand(command, params, client) {
[`Locked`, `${getYesNoFromBool(vehicleData.locked)}`], [`Locked`, `${getYesNoFromBool(vehicleData.locked)}`],
[`Engine`, `${getOnOffFromBool(vehicleData.engine)}`], [`Engine`, `${getOnOffFromBool(vehicleData.engine)}`],
[`Lights`, `${getOnOffFromBool(vehicleData.lights)}`], [`Lights`, `${getOnOffFromBool(vehicleData.lights)}`],
[`Buy Price`, `${vehicleData.buyPrice}`], [`Buy Price`, `${getCurrencyString(vehicleData.buyPrice)}`],
[`Rent Price`, `${vehicleData.rentPrice}`], [`Rent Price`, `${getCurrencyString(vehicleData.rentPrice)}`],
[`Radio Station`, `${(vehicleData.streamingRadioStationIndex == -1) ? "None" : getRadioStationData(vehicleData.streamingRadioStationIndex).name}`], [`Radio Station`, `${(vehicleData.streamingRadioStationIndex == -1) ? "None" : getRadioStationData(vehicleData.streamingRadioStationIndex).name}`],
[`Parked`, `${getYesNoFromBool(vehicleData.spawnLocked)}`], [`Parked`, `${getYesNoFromBool(vehicleData.spawnLocked)}`],
[`License Plate`, `${vehicleData.licensePlate}`], [`License Plate`, `${vehicleData.licensePlate}`],
@@ -1362,17 +1362,21 @@ function reloadAllVehiclesCommand(command, params, client) {
// =========================================================================== // ===========================================================================
function respawnVehicleCommand(command, params, client) { function respawnVehicleCommand(command, params, client) {
if (isPlayerInAnyVehicle(client)) { if (!isPlayerInAnyVehicle(client)) {
removeAllOccupantsFromVehicle(getPlayerVehicle(client)); messagePlayerError(client, getLocaleString(client, "MustBeInAVehicle"));
respawnVehicle(getPlayerVehicle(client)); return false;
} }
let vehicle = getPlayerVehicle(client);
//removeAllOccupantsFromVehicle(vehicle);
respawnVehicle(vehicle);
setAllVehicleIndexes(); setAllVehicleIndexes();
messagePlayerSuccess(client, getLocaleString(client, `YourVehicleRespawned`)); messagePlayerSuccess(client, getLocaleString(client, `YourVehicleRespawned`));
} }
// =========================================================================== // ===========================================================================
function respawnAllVehiclesCommand(command, params, client) { function respawnAllVehiclesCommand(command, params, client) {
@@ -1765,7 +1769,7 @@ function checkVehiclePurchasing(client) {
} }
getServerData().purchasingVehicleCache.splice(getServerData().purchasingVehicleCache.indexOf(client), 1); getServerData().purchasingVehicleCache.splice(getServerData().purchasingVehicleCache.indexOf(client), 1);
if (getVehicleData(getPlayerData(client).buyingVehicle).ownerType == AGRP_VEHOWNER_BUSINESS || getVehicleData(getPlayerData(client).buyingVehicle).ownerType == AGRP_VEHOWNER_NONE) { if (getVehicleData(getPlayerData(client).buyingVehicle).ownerType == AGRP_VEHOWNER_BIZ || getVehicleData(getPlayerData(client).buyingVehicle).ownerType == AGRP_VEHOWNER_NONE) {
createNewDealershipVehicle(getVehicleData(getPlayerData(client).buyingVehicle).model, getVehicleData(getPlayerData(client).buyingVehicle).spawnPosition, getVehicleData(getPlayerData(client).buyingVehicle).spawnRotation, getVehicleData(getPlayerData(client).buyingVehicle).buyPrice, getVehicleData(getPlayerData(client).buyingVehicle).ownerId); createNewDealershipVehicle(getVehicleData(getPlayerData(client).buyingVehicle).model, getVehicleData(getPlayerData(client).buyingVehicle).spawnPosition, getVehicleData(getPlayerData(client).buyingVehicle).spawnRotation, getVehicleData(getPlayerData(client).buyingVehicle).buyPrice, getVehicleData(getPlayerData(client).buyingVehicle).ownerId);
} }
takePlayerCash(client, getVehicleData(getPlayerData(client).buyingVehicle).buyPrice); takePlayerCash(client, getVehicleData(getPlayerData(client).buyingVehicle).buyPrice);