Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-01 14:07:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
TheMode 2021-09-20 22:29:11 +02:00
commit 3ea414fe85
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minestom/server/item/metadata/PlayerHeadMeta.java
View File

@ -19,7 +19,7 @@ public class PlayerHeadMeta extends ItemMeta implements ItemMetaBuilder.Provider
private final PlayerSkin playerSkin; private final PlayerSkin playerSkin;
protected PlayerHeadMeta(@NotNull ItemMetaBuilder metaBuilder, UUID skullOwner, protected PlayerHeadMeta(@NotNull ItemMetaBuilder metaBuilder, UUID skullOwner,
PlayerSkin playerSkin) { @Nullable PlayerSkin playerSkin) {
super(metaBuilder); super(metaBuilder);
this.skullOwner = skullOwner; this.skullOwner = skullOwner;
this.playerSkin = playerSkin; this.playerSkin = playerSkin;
@ -29,7 +29,7 @@ public class PlayerHeadMeta extends ItemMeta implements ItemMetaBuilder.Provider
return skullOwner; return skullOwner;
} }
public PlayerSkin getPlayerSkin() { public @Nullable PlayerSkin getPlayerSkin() {
return playerSkin; return playerSkin;
} }
@ -48,6 +48,11 @@ public class PlayerHeadMeta extends ItemMeta implements ItemMetaBuilder.Provider
public Builder playerSkin(@Nullable PlayerSkin playerSkin) { public Builder playerSkin(@Nullable PlayerSkin playerSkin) {
this.playerSkin = playerSkin; this.playerSkin = playerSkin;
handleCompound("SkullOwner", nbtCompound -> { handleCompound("SkullOwner", nbtCompound -> {
if (playerSkin == null) {
nbtCompound.removeTag("Properties");
return;
}
NBTList<NBTCompound> textures = new NBTList<>(NBTTypes.TAG_Compound); NBTList<NBTCompound> textures = new NBTList<>(NBTTypes.TAG_Compound);
String value = this.playerSkin.getTextures() == null ? "" : this.playerSkin.getTextures(); String value = this.playerSkin.getTextures() == null ? "" : this.playerSkin.getTextures();
String signature = this.playerSkin.getSignature() == null ? "" : this.playerSkin.getSignature(); String signature = this.playerSkin.getSignature() == null ? "" : this.playerSkin.getSignature();