vehicleEntryInstance assignment fix

swift502 · swift502 · commit d56e8d024904 · 2020-08-15T21:48:32.000+02:00
diff --git a/src/ts/characters/Character.ts b/src/ts/characters/Character.ts
@@ -611,8 +611,8 @@ export class Character extends THREE.Object3D implements IWorldEntity
 		if (vehicleFinder.closestObject !== undefined)
 		{
 			let vehicle = vehicleFinder.closestObject;
-			this.vehicleEntryInstance = new VehicleEntryInstance(this);
-			this.vehicleEntryInstance.wantsToDrive = wantsToDrive;
+			let vehicleEntryInstance = new VehicleEntryInstance(this);
+			vehicleEntryInstance.wantsToDrive = wantsToDrive;
 
 			// Find best seat
 			let seatFinder = new ClosestObjectFinder<SeatPoint>(this.position);
@@ -642,9 +642,6 @@ export class Character extends THREE.Object3D implements IWorldEntity
 				}
 				else
 				{
-					// Skip driver seats
-					if (seat.type === SeatType.Driver) continue;
-
 					// Consider passenger seats
 					if (seat.type === SeatType.Passenger)
 					{
@@ -657,7 +654,7 @@ export class Character extends THREE.Object3D implements IWorldEntity
 			if (seatFinder.closestObject !== undefined)
 			{
 				let targetSeat = seatFinder.closestObject;
-				this.vehicleEntryInstance.targetSeat = targetSeat;
+				vehicleEntryInstance.targetSeat = targetSeat;
 
 				let entryPointFinder = new ClosestObjectFinder<Object3D>(this.position);
 
@@ -668,8 +665,9 @@ export class Character extends THREE.Object3D implements IWorldEntity
 
 				if (entryPointFinder.closestObject !== undefined)
 				{
-					this.vehicleEntryInstance.entryPoint = entryPointFinder.closestObject;
+					vehicleEntryInstance.entryPoint = entryPointFinder.closestObject;
 					this.triggerAction('up', true);
+					this.vehicleEntryInstance = vehicleEntryInstance;
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -611,8 +611,8 @@ export class Character extends THREE.Object3D implements IWorldEntity`
`611`	`611`	`if (vehicleFinder.closestObject !== undefined)`
`612`	`612`	`{`
`613`	`613`	`let vehicle = vehicleFinder.closestObject;`
`614`		`- this.vehicleEntryInstance = new VehicleEntryInstance(this);`
`615`		`- this.vehicleEntryInstance.wantsToDrive = wantsToDrive;`
	`614`	`+ let vehicleEntryInstance = new VehicleEntryInstance(this);`
	`615`	`+ vehicleEntryInstance.wantsToDrive = wantsToDrive;`
`616`	`616`
`617`	`617`	`// Find best seat`
`618`	`618`	`let seatFinder = new ClosestObjectFinder<SeatPoint>(this.position);`
`@@ -642,9 +642,6 @@ export class Character extends THREE.Object3D implements IWorldEntity`
`642`	`642`	`}`
`643`	`643`	`else`
`644`	`644`	`{`
`645`		`- // Skip driver seats`
`646`		`- if (seat.type === SeatType.Driver) continue;`
`647`		`-`
`648`	`645`	`// Consider passenger seats`
`649`	`646`	`if (seat.type === SeatType.Passenger)`
`650`	`647`	`{`
`@@ -657,7 +654,7 @@ export class Character extends THREE.Object3D implements IWorldEntity`
`657`	`654`	`if (seatFinder.closestObject !== undefined)`
`658`	`655`	`{`
`659`	`656`	`let targetSeat = seatFinder.closestObject;`
`660`		`- this.vehicleEntryInstance.targetSeat = targetSeat;`
	`657`	`+ vehicleEntryInstance.targetSeat = targetSeat;`
`661`	`658`
`662`	`659`	`let entryPointFinder = new ClosestObjectFinder<Object3D>(this.position);`
`663`	`660`
`@@ -668,8 +665,9 @@ export class Character extends THREE.Object3D implements IWorldEntity`
`668`	`665`
`669`	`666`	`if (entryPointFinder.closestObject !== undefined)`
`670`	`667`	`{`
`671`		`- this.vehicleEntryInstance.entryPoint = entryPointFinder.closestObject;`
	`668`	`+ vehicleEntryInstance.entryPoint = entryPointFinder.closestObject;`
`672`	`669`	`this.triggerAction('up', true);`
	`670`	`+ this.vehicleEntryInstance = vehicleEntryInstance;`
`673`	`671`	`}`
`674`	`672`	`}`
`675`	`673`	`}`