Issue #6790: Prevent NPE from C3 when Refitting #6808
Merged
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
…eloading game entities.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6808 +/- ##
=========================================
Coverage 11.45% 11.46%
+ Complexity 6506 6501 -5
=========================================
Files 1098 1098
Lines 140875 140807 -68
Branches 21845 21829 -16
=========================================
- Hits 16144 16137 -7
+ Misses 123057 123000 -57
+ Partials 1674 1670 -4 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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.
Fixes #6790
Fixes #6791
Regarding the change to
Campaign::reloadGameEntities: This preventsaddEntityfrom generating aGameEntityNewEventand setting the initial BV. This is unnecessary as these units were already added to the game and we're just reloading them. This includes when returning from scenarios, the other placereloadGameEntitiesis used.When calculating the BV of C3 it will clear C3 connections if they aren't valid, so this prevents networks from being broken as the entities are re-added to the game.