tweak(extra-natives/five): sanitize mission train creation #2982
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
github-actions
bot
added
triage
|
There was a bug that broke building the server project, but it has been fixed in master. Can you merge that fix into your branch? I will do a review once that's done. Thank you! |
Ehbw
force-pushed
the
fix/validate-train-native
branch
from
6a690f8 to
8d91379
Compare
github-actions
bot
added
triage
Done |
dalekenium-cfx
approved these changes
Dec 9, 2024
dalekenium-cfx
added
ready-to-merge
|
hey @Ehbw in case you did not notice yet but @prikolium-cfx merged some of your other commits recently :) |
|
Could you please rebase it from master? |
Ehbw
force-pushed
the
fix/validate-train-native
branch
from
8d91379 to
26f999b
Compare
Ehbw
force-pushed
the
fix/validate-train-native
branch
from
26f999b to
4858e5b
Compare
github-actions
bot
added
triage
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.
Goal of this PR
Prevent client crashes when using the CREATE_MISSION_TRAIN native.
How is this PR achieving the goal
By adding checks that are missing with the original native implementation. Such as invalid train variations (that do not exist in trains.xml), required carriage models not being loaded, and checking to ensure that there is at least a single track enabled to create a train on (this wouldn't crash the client, but would rather return a native error in the console which could be confusing to users).
This PR also moves some Train structs from TrackNatives to a Train header file to reduce code duplication
This PR applies to the following area(s)
FiveM
Successfully tested on
Game builds: 1604, 2060, 2372, 2545, 2699, 2802, 3095, 3258, 3407
Platforms: Windows
I've created a repro resource to reproduce the crashes and their new behaviour with this PR.
train-crash-test.zip
Checklist
Fixes issues