Skip to content

Commit deb03b5

Browse files
authored
Entity Passengers get pushed wrongly (#3601)
* Fixed splicing issue that wrongly removes passengers * Test: trying to fix CI tests
1 parent 188db17 commit deb03b5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/plugins/entities.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -808,9 +808,9 @@ function inject (bot) {
808808
const vehicle = packet.vehicleId === -1 ? null : fetchEntity(packet.vehicleId)
809809

810810
const originalVehicle = passenger.vehicle
811-
if (originalVehicle !== null) {
811+
if (originalVehicle) {
812812
const index = originalVehicle.passengers.indexOf(passenger)
813-
originalVehicle.passengers = originalVehicle.passengers.splice(index, 1)
813+
originalVehicle.passengers.splice(index, 1)
814814
}
815815
passenger.vehicle = vehicle
816816
vehicle.passengers.push(passenger)
@@ -833,12 +833,12 @@ function inject (bot) {
833833

834834
for (const passengerEntity of passengerEntities) {
835835
const originalVehicle = passengerEntity.vehicle
836-
if (originalVehicle !== null) {
836+
if (originalVehicle) {
837837
const index = originalVehicle.passengers.indexOf(passengerEntity)
838-
originalVehicle.passengers = originalVehicle.passengers.splice(index, 1)
838+
originalVehicle.passengers.splice(index, 1)
839839
}
840840
passengerEntity.vehicle = vehicle
841-
if (vehicle !== null) {
841+
if (vehicle) {
842842
vehicle.passengers.push(passengerEntity)
843843
}
844844
}
@@ -869,7 +869,7 @@ function inject (bot) {
869869
if (entity.vehicle) {
870870
const index = entity.vehicle.passengers.indexOf(entity)
871871
if (index !== -1) {
872-
entity.vehicle.passengers = entity.vehicle.passengers.splice(index, 1)
872+
entity.vehicle.passengers.splice(index, 1)
873873
}
874874
}
875875
})

0 commit comments

Comments
 (0)