Skip to content

Commit 52bcb71

Browse files
committed
Properly keep track of vehicle paintjobs/colors
1 parent 8773ae5 commit 52bcb71

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

javascript/entities/vehicle.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ export class Vehicle extends Supplementable {
125125
if (options.virtualWorld)
126126
this.virtualWorld = options.virtualWorld;
127127

128+
this.#primaryColor_ = options.primaryColor;
129+
this.#secondaryColor_ = options.secondaryColor;
130+
131+
this.#paintjob_ = null;
132+
128133
if (options.paintjob)
129134
this.paintjob = options.paintjob;
130135

@@ -238,6 +243,13 @@ export class Vehicle extends Supplementable {
238243

239244
isConnected() { return this.id_ !== Vehicle.kInvalidId; }
240245

246+
setColorsInternal(primaryColor, secondaryColor) {
247+
this.#primaryColor_ = primaryColor;
248+
this.#secondaryColor_ = secondaryColor;
249+
}
250+
251+
setPaintjobInternal(paintjob) { this.#paintjob_ = paintjob; }
252+
241253
// ---------------------------------------------------------------------------------------------
242254
// World positioning and state information.
243255
// ---------------------------------------------------------------------------------------------

javascript/entities/vehicle_manager.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ export class VehicleManager {
160160
const vehicle = this.vehicles_.get(event.vehicleid);
161161
if (!vehicle)
162162
return;
163-
163+
164+
vehicle.setPaintjobInternal(event.paintjobid);
165+
164166
this.notifyObservers('onVehiclePaintjob', player, vehicle, event.paintjobid);
165167
}
166168

@@ -173,6 +175,8 @@ export class VehicleManager {
173175
if (!vehicle)
174176
return;
175177

178+
vehicle.setColorsInternal(event.color1, event.color2);
179+
176180
this.notifyObservers('onVehicleRespray', player, vehicle, event.color1, event.color2);
177181
}
178182

0 commit comments

Comments
 (0)