Skip to content

Commit 7d7f217

Browse files
committed
Create an additional block list for house vehicles
Fixes #796
1 parent ca375c6 commit 7d7f217

1 file changed

Lines changed: 24 additions & 0 deletions

File tree

javascript/features/houses/house_vehicle_commands.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,27 @@ import { VehicleModel } from 'entities/vehicle_model.js';
99
import { alert } from 'components/dialogs/alert.js';
1010
import { confirm } from 'components/dialogs/confirm.js';
1111

12+
// Additional block list for vehicles that cannot be saved as house vehicles.
13+
const kVehicleModelBlockList = new Set([
14+
406 /* Dumper */,
15+
408 /* Trashmaster */,
16+
427 /* Enforcer */,
17+
431 /* Bus */,
18+
432 /* Rhino */,
19+
444 /* Monaster */,
20+
486 /* Dozer */,
21+
524 /* Cement Truck */,
22+
528 /* FBI Truck */,
23+
532 /* Combine Harvester */,
24+
537 /* Freight Train */,
25+
538 /* Passenger Train */,
26+
544 /* Firetruck */,
27+
556 /* Monster A */,
28+
557 /* Monster B */,
29+
578 /* DFT-30 */,
30+
601 /* SWAT Tank */,
31+
]);
32+
1233
// Responsible for allowing players to save any vehicle as their house vehicles, even when they have
1334
// tuned and/or customised it to their liking with the server's regular abilities.
1435
export class HouseVehicleCommands extends VehicleCommandDelegate {
@@ -193,6 +214,9 @@ export class HouseVehicleCommands extends VehicleCommandDelegate {
193214
if (!vehicleModel)
194215
return false;
195216

217+
if (kVehicleModelBlockList.has(vehicleModel.id))
218+
return false;
219+
196220
return !vehicleModel.isAirborne() &&
197221
!vehicleModel.isRemoteControllable() &&
198222
!vehicleModel.isTrailer();

0 commit comments

Comments
 (0)