-
Notifications
You must be signed in to change notification settings - Fork 2.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Minor fixes for trains, use IsEntityValid
for other calls checking if the entity exists
#2902
Merged
prikolium-cfx
merged 2 commits into
citizenfx:master
from
AvarianKnight:tweak/train-fixes
Dec 25, 2024
Merged
Minor fixes for trains, use IsEntityValid
for other calls checking if the entity exists
#2902
prikolium-cfx
merged 2 commits into
citizenfx:master
from
AvarianKnight:tweak/train-fixes
Dec 25, 2024
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
This was the script used to test this for orphan mode, |
github-actions
bot
added
the
invalid
Requires changes before it's considered valid and can be (re)triaged
label
Nov 1, 2024
AvarianKnight
force-pushed
the
tweak/train-fixes
branch
from
November 2, 2024 02:36
561b703
to
207ff42
Compare
code/components/citizen-server-impl/src/state/ServerGameState.cpp
Outdated
Show resolved
Hide resolved
code/components/citizen-server-impl/src/state/ServerGameState.cpp
Outdated
Show resolved
Hide resolved
code/components/citizen-server-impl/include/state/ServerGameState.h
Outdated
Show resolved
Hide resolved
AvarianKnight
force-pushed
the
tweak/train-fixes
branch
2 times, most recently
from
November 5, 2024 04:03
ebb195c
to
b4b698c
Compare
AvarianKnight
force-pushed
the
tweak/train-fixes
branch
from
November 5, 2024 04:04
b4b698c
to
8957209
Compare
github-actions
bot
added
triage
Needs a preliminary assessment to determine the urgency and required action
invalid
Requires changes before it's considered valid and can be (re)triaged
and removed
invalid
Requires changes before it's considered valid and can be (re)triaged
triage
Needs a preliminary assessment to determine the urgency and required action
labels
Nov 5, 2024
4 tasks
FabianTerhorst
approved these changes
Dec 22, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 Thanks a lot for the contribution.
FabianTerhorst
added
ready-to-merge
This PR is enqueued for merging
and removed
invalid
Requires changes before it's considered valid and can be (re)triaged
labels
Dec 22, 2024
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
Fix some oversights in some code regarding entity validation, trains, and how deletions for trains are handled, and how setting orphan mode is handled for trains
How is this PR achieving the goal
Make code that iterates over trains more generic so we can re-use it throughout more code.
Make calls that were previously just checking for
!entity
also check for if the entity is being deleted, fixes some casesWhen called on trains
SET_ENTITY_ORPHAN_MODE
will also set the orphan mode for all trains attached, fixing the possibility of partial deletes from a train not being relevant.Change
DELETE_ENTITY
to not allow it to be called on train carriages, as we don't have a way to write to the sync node of the current train that one of its links no longer exists, this could lead to broken state and possibly cause weird issues.Add
DELETE_TRAIN
which when called on any part of the train will delete the entire train.This PR applies to the following area(s)
Server
Successfully tested on
Platforms: Windows
Checklist