Add ammo null check to prevent NPEs for firing artillery bays #5518
Conversation
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
| r.newlines = 0; | ||
| r.subject = subjectId; | ||
| r.add(wtype.getName() + " (" + atype.getShortName() + ")"); | ||
| r.add(wtype.getName() + (atype != null ? " (" + atype.getShortName() + ")" : "")); |
Check warning
Code scanning / CodeQL
Dereferenced variable may be null
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 #5503
I think there must be more going on here. Bay shots don't quite seem to care about ammo, at least before the shot is actually taken. But this PR will at least fix the NPE from the report and allow the game to continue. Firing with the Arrow IV bay with the from the issue will correctly redice the ammo count by 12 for each shot (of 12 weapons).