ItemType Random Safety Improvements #6886
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
APickledWalrus
added
bug
sovdeeth
approved these changes
Jul 10, 2024
UnderscoreTud
approved these changes
Jul 10, 2024
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.
Description
This PR aims to fix usages of ItemType#getRandom that did not properly check whether it is null (as is possible due to 1.21 changes).
I've updated
ItemType#getMaterialto instead return a random Material rather than the material of the first ItemData. Some places do not need a random ItemStack, just a random Material (which can never be null).Additionally, I've added a new method,
getRandomStackOrMaterial(terrible I know, suggestions welcome) which grabs a random ItemData from the ItemType, and returns its ItemStack or Material (if it does not have stack). This is for cases where either an ItemStack or a Material is valid (e.g. max stack size). We may also choose to not return values for these materials, even though they exist. Thoughts welcome 🙂Target Minecraft Versions: any
Requirements: none
Related Issues: