more robust orphan cleanup #2690
Merged
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
NickAragua
requested review from
sixlettervariables,
neoancient and
Windchild292
Windchild292
reviewed
Mar 2, 2021
| @@ -1402,7 +1406,6 @@ public synchronized void removeEntity(int id, int condition) { | |||
| return; | |||
| } | |||
|
|
|||
| entities.remove(toRemove); | |||
| entityIds.remove(Integer.valueOf(id)); | |||
There was a problem hiding this comment.
Shouldn't we also remove the id before the if statement?
There was a problem hiding this comment.
Probably wouldn't hurt, but, unlike entities, we don't use that lookup table to drive "get me all the entities in the game" functionality.
Windchild292
approved these changes
Mar 2, 2021
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.
For some reason, the game's entities collection got out of sync with the rest of its entity management collections, so an entity destroyed in the physical phase was showing up in the game (though with 0 CT structure) when loading a save game made in the end phase.
This change makes game more aggressive about keeping the entities collection clear of entities being removed.