fix recurseIngredientTreeAdd returning true on conflicts#2090
Merged
TechLord22 merged 2 commits intomasterfrom Sep 23, 2023
Merged
fix recurseIngredientTreeAdd returning true on conflicts#2090TechLord22 merged 2 commits intomasterfrom
TechLord22 merged 2 commits intomasterfrom
Conversation
PrototypeTrousers
approved these changes
Sep 23, 2023
Gebardensprache
added a commit
to ChildCommunitCN/GregTech-ChildHappyEdition
that referenced
this pull request
Sep 24, 2023
fix recurseIngredientTreeAdd returning true on conflicts (GregTechCEu#2090)
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.
What
Fixes
RecipeMap#recurseIngredientTreeAddreturning true on a recipe conflict. This would lead to the conflicting recipe still being added to its category, which would then show up in JEI despite not being present in the search tree.Implementation Details
When an existing recipe (left branch) is found during addition, it is kept in the map. This value was then checked for presence (indicating a recipe was added) but never validated that the recipe was actually the one attempting to be added. This resulted in false-positive addition success. This also meant that the paths to conflicting recipes would not be removed from the search tree, leading to extra memory consumption.
Outcome
Fixes conflicting recipes showing in JEI despite not being registered.