Fix custom statistic criteria creation #9595
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
NoahvdAa
commented
Aug 12, 2023
| + | ||
| + @Override | ||
| + public String getStatisticCriteriaKey(org.bukkit.Statistic statistic) { | ||
| + if (statistic.getType() != org.bukkit.Statistic.Type.UNTYPED) return "minecraft.custom:minecraft." + statistic.getKey().getKey(); |
There was a problem hiding this comment.
For context; CraftStatistic#getNMSStatistic only allows looking up untyped statistics. Typed statistics don't/shouldn't work with the Criteria#static method anyway, as described in the javadocs, so this keeps the same behavior as before.
Machine-Maker
approved these changes
Aug 12, 2023
lynxplay
approved these changes
Aug 12, 2023
lynxplay
force-pushed
the
fix/custom-statistic-criteria
branch
from
1afd12f
to
a7889a0
Compare
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.
When looking into fixing #9507 I noticed a lot more statistic criterion than just the play time were broken by the 'naive' enum -> key conversion. See the wiki for the full list, everything that doesn't match with the enum is broken.
Rather than having to update the entire enum with the correct names in the way lynx showed in this comment, I opted for grabbing the correct statistic key from the server itself, using unsafevalues to bridge the gap. This should be easier to maintain and will prevent us missing the enum update should the keys change again.
A proper, long-term solution would be #5691, but until then I believe this is best fix.
Fixes #9507.