fix(wool): use platform-specific ColorUtils for wool matching #1364
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
On 1.21 servers, CraftItemStack#getData() returns unsubclassed MaterialData for wool item stacks, hence we cannot check for `instanceof Wool` there. This patch changes the appropriate code to a manual comparison, enabling pickup and proximity tracking to work regardless of whether the material data is correctly subclassed. Signed-off-by: TTtie <[email protected]>
cswhite2000
requested changes
Jul 10, 2024
…orrectness Signed-off-by: TTtie <[email protected]>
TTtie
changed the title
cswhite2000
reviewed
Jul 10, 2024
...m/platform-sportpaper/src/main/java/tc/oc/pgm/platform/sportpaper/material/SpColorUtils.java
Outdated
Show resolved
Hide resolved
Signed-off-by: TTtie <[email protected]>
Pablete1234
reviewed
Jul 10, 2024
platform/platform-modern/src/main/java/tc/oc/pgm/platform/modern/material/ModernColorUtils.java
Outdated
Show resolved
Hide resolved
Pablete1234
reviewed
Jul 10, 2024
Signed-off-by: TTtie <[email protected]>
cswhite2000
approved these changes
Jul 10, 2024
Per PGMDev#1364 (comment) explicit access modifiers are preferred and there is no good reason to ban possible subclasses of WoolModule from accessing the material matcher Signed-off-by: TTtie <[email protected]>
Pablete1234
pushed a commit
that referenced
this pull request
Jul 20, 2024
Signed-off-by: Pablo Herrera <[email protected]>
Pablete1234
pushed a commit
that referenced
this pull request
Jul 20, 2024
Signed-off-by: Pablo Herrera <[email protected]>
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.
On 1.21 servers, CraftItemStack#getData() returns unsubclassed MaterialData for wool item stacks, hence we cannot check for
instanceof Woolthere. This patch changes the appropriate code to a manual comparison, enabling pickup and proximity tracking to work regardless of whether the material data is correctly subclassed.