Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-23 16:41:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix nullability for Player shoulder entity data (#1834)

Browse Source
This commit is contained in:
Zak Shearman 2023-05-01 14:06:48 +01:00 committed by GitHub
parent 79ce9570ea
commit 85febebd09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/entity/metadata/PlayerMeta.java
View File

@ -6,6 +6,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jglrxavpok.hephaistos.nbt.NBT; import org.jglrxavpok.hephaistos.nbt.NBT;
import java.util.Map;
public class PlayerMeta extends LivingEntityMeta { public class PlayerMeta extends LivingEntityMeta {
public static final byte OFFSET = LivingEntityMeta.MAX_OFFSET; public static final byte OFFSET = LivingEntityMeta.MAX_OFFSET;
public static final byte MAX_OFFSET = OFFSET + 1; public static final byte MAX_OFFSET = OFFSET + 1;
@ -108,6 +110,8 @@ public class PlayerMeta extends LivingEntityMeta {
} }
public void setLeftShoulderEntityData(@Nullable NBT value) { public void setLeftShoulderEntityData(@Nullable NBT value) {
if (value == null) value = NBT.Compound(Map.of());
super.metadata.setIndex(OFFSET + 4, Metadata.NBT(value)); super.metadata.setIndex(OFFSET + 4, Metadata.NBT(value));
} }
@ -117,6 +121,8 @@ public class PlayerMeta extends LivingEntityMeta {
} }
public void setRightShoulderEntityData(@Nullable NBT value) { public void setRightShoulderEntityData(@Nullable NBT value) {
if (value == null) value = NBT.Compound(Map.of());
super.metadata.setIndex(OFFSET + 5, Metadata.NBT(value)); super.metadata.setIndex(OFFSET + 5, Metadata.NBT(value));
} }