Fix Carryalls attempting to deliver units that they aren't carrying.#22250
Merged
Conversation
PunkPun
reviewed
Dec 28, 2025
| // something might have happened to the cargo in the time between the activity being | ||
| // queued and being run, so short out if it is no longer valid. | ||
| if (carryall.Carryable == null) | ||
| if (carryall.Carryable == null || carryall.State != Carryall.CarryallState.Carrying) |
Member
There was a problem hiding this comment.
The code that changes the state also sets Carryable to null. So this doesn't seem like the right fix? Did you try to run this through the replay?
Member
Author
There was a problem hiding this comment.
I did, yes. The carryable was reserved for pickup (CarryallState.Reserved), but not actually picked when this action runs.
Member
There was a problem hiding this comment.
I see. And I assume the rest of the code is able to handle this case?
Member
Author
There was a problem hiding this comment.
As far as I can tell, yes.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #21892.