Fix conflicting resource conditions in 1.20.1#204
Merged
Su5eD merged 1 commit intoSinytra:1.20.1from Mar 10, 2025
Merged
Conversation
Fixes Sinytra#154 Fixes Sinytra#129 This is somewhat akin to 59440bc, but for 1.20.1
ThexXTURBOXx
commented
Mar 7, 2025
| * <p>If an exception is thrown during condition testing, it will be caught and logged, and false will be returned. | ||
| */ | ||
| public static boolean objectMatchesConditions(JsonObject object) { | ||
| if (JsonHelper.hasArray(object, "conditions")) return true; |
Author
There was a problem hiding this comment.
I am not 100% sure whether there is a better way to reference "conditions". I couldn't find a constant which contains this string in Forge's source code, so I hardcoded it here for now... Is there something?
Su5eD
approved these changes
Mar 10, 2025
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 #154
Fixes #129
This is somewhat akin to 59440bc, but for 1.20.1
I got a bug report over at ThexXTURBOXx/Balkons-WeaponMod-Legacy#97 regarding this