Fix potential null vehicle passengers array in entities plugin #3575
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Remove unnecessary semicolons - Simplify dismount event emission - Ensure consistent null and array checks for vehicle and passenger entities
|
I didn't modify beds, but I can fix the error in beds if needed. Let me know! |
|
The more error you fix the better |
|
OK give me 30 mins |
|
Wait that test passed local |
- Remove commented initialization comment - Simplify comments for passenger entity checks - Maintain existing logic for removing passengers from vehicles
|
Ok cool their |
rom1504
reviewed
Jan 31, 2025
| @@ -806,13 +806,21 @@ function inject (bot) { | |||
| const passenger = fetchEntity(packet.entityId) | |||
| const vehicle = packet.vehicleId === -1 ? null : fetchEntity(packet.vehicleId) | |||
|
|
|||
| // Initialize passengers arrays if they don't exist | |||
| if (!passenger.passengers) passenger.passengers = [] | |||
There was a problem hiding this comment.
can this happen? if so why? can we initialize this when we create the entity?
rom1504
reviewed
Jan 31, 2025
| @@ -806,13 +806,21 @@ function inject (bot) { | |||
| const passenger = fetchEntity(packet.entityId) | |||
| const vehicle = packet.vehicleId === -1 ? null : fetchEntity(packet.vehicleId) | |||
|
|
|||
| // Initialize passengers arrays if they don't exist | |||
| if (!passenger.passengers) passenger.passengers = [] | |||
| if (vehicle && !vehicle.passengers) vehicle.passengers = [] | |||
rom1504
reviewed
Jan 31, 2025
| const originalVehicle = passenger.vehicle | ||
| if (originalVehicle !== null) { | ||
| if (originalVehicle && originalVehicle.passengers && Array.isArray(originalVehicle.passengers)) { |
There was a problem hiding this comment.
can this happen? is it a minecraft bug?
rom1504
reviewed
Jan 31, 2025
| } | ||
| passenger.vehicle = vehicle | ||
| vehicle.passengers.push(passenger) | ||
| if (vehicle && vehicle.passengers && Array.isArray(vehicle.passengers)) { |
There was a problem hiding this comment.
can vehicle.passengers not be an array?
rom1504
reviewed
Jan 31, 2025
| @@ -830,14 +838,27 @@ function inject (bot) { | |||
| const passengerEntities = passengers.map((passengerId) => fetchEntity(passengerId)) | |||
| const vehicle = entityId === -1 ? null : bot.entities[entityId] | |||
|
|
|||
| if (vehicle && !vehicle.passengers) { | |||
rom1504
reviewed
Jan 31, 2025
| return bot.entities[id] || (bot.entities[id] = new Entity(id)) | ||
| if (!bot.entities[id]) { | ||
| const entity = new Entity(id) | ||
| entity.passengers = [] |
There was a problem hiding this comment.
why not put this directly in prismarine entity ?
if we do that here why do we need to check passengers is an array above?
rom1504
reviewed
Jan 31, 2025
| if (dimData) { | ||
| bot.game.minY = dimData.minY | ||
| bot.game.height = dimData.height | ||
| if (bot.registry.dimensionsByName) { |
There was a problem hiding this comment.
can this be empty? is it a bug in minecraft ?
|
sorry way to much effort GL tho love the project |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix crash caused by undefined vehicle entity in entities.js
This commit fixes a crash occurring when attempting to access
vehicle.passengerson an undefined
vehicleentity. The issue was triggered in:lib\plugins\entities.js:841