Skip to content

Properly put null values in data component map #895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
onebeastchris merged 1 commit into from
May 9, 2025
Merged

Properly put null values in data component map #895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...ain/java/org/geysermc/mcprotocollib/protocol/data/game/item/component/DataComponents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
* <li>Is a full map, {@code null} means an absence of the component in the map. {@link DataComponents#put(DataComponentType, Object)} should not be used with {@code null} values, rather {@link DataComponents#remove(DataComponentType)} should be used.</li>
* <li>Is a patch, {@code null} can mean an absence of the component in the patch, or that the component should be removed from a map the patch is applied to. Use {@link DataComponents#contains(DataComponentType)}, which returns {@code true} for the latter, to check which is the case.</li>
* </ul>
*
* <p>Make sure to initialise this class with a map that accepts null values if representing a patch.</p>
*/
@Data
@AllArgsConstructor
Expand All @@ -38,11 +36,11 @@ public <T> T getOrDefault(DataComponentType<T> type, T def) {
}

/**
* @param value should only be {@code null } if this map is a patch to another map and specifying the removal of the specific component.
* @param value should only be {@code null} if this map is a patch to another map and specifying the removal of the specific component.
*/
public <T> void put(DataComponentType<T> type, @Nullable T value) {
if (value == null) {
dataComponents.put(type, null);
dataComponents.put(type, type.readNullDataComponent());
} else if (type instanceof IntComponentType intType) {
dataComponents.put(intType, intType.primitiveFactory.createPrimitive(intType, (Integer) value));
} else if (type instanceof BooleanComponentType boolType) {
Expand Down
Loading