From 38138854a7fc7b40af92b5cc810e42400b6ee380 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:36:25 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls This allows you to create already filled textures on Skulls to avoid texture lookups which commonly cause rate limit issues with Mojang API diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java index 110e04597..c260af11c 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java @@ -1,5 +1,7 @@ package org.bukkit.craftbukkit.block; +import com.destroystokyo.paper.profile.CraftPlayerProfile; +import com.destroystokyo.paper.profile.PlayerProfile; import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; import net.minecraft.server.MinecraftServer; @@ -16,6 +18,7 @@ import org.bukkit.block.data.BlockData; import org.bukkit.block.data.Directional; import org.bukkit.block.data.Rotatable; import org.bukkit.craftbukkit.entity.CraftPlayer; +import javax.annotation.Nullable; public class CraftSkull extends CraftBlockEntityState implements Skull { @@ -106,6 +109,20 @@ public class CraftSkull extends CraftBlockEntityState implement } } + // Paper start + @Override + public void setPlayerProfile(PlayerProfile profile) { + Preconditions.checkNotNull(profile, "profile"); + this.profile = CraftPlayerProfile.asAuthlibCopy(profile); + } + + @Nullable + @Override + public PlayerProfile getPlayerProfile() { + return profile != null ? CraftPlayerProfile.asBukkitCopy(profile) : null; + } + // Paper end + @Override public BlockFace getRotation() { BlockData blockData = getBlockData(); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java index 2ad3acf43..87e51cf8a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory; import java.util.Map; +import com.destroystokyo.paper.profile.CraftPlayerProfile; +import com.destroystokyo.paper.profile.PlayerProfile; import net.minecraft.server.GameProfileSerializer; import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagCompound; @@ -20,6 +22,8 @@ import org.bukkit.inventory.meta.SkullMeta; import com.google.common.collect.ImmutableMap.Builder; import com.mojang.authlib.GameProfile; +import javax.annotation.Nullable; + @DelegateDeserialization(SerializableMeta.class) class CraftMetaSkull extends CraftMetaItem implements SkullMeta { @@ -133,6 +137,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { return hasOwner() ? profile.getName() : null; } + // Paper start + @Override + public void setPlayerProfile(@Nullable PlayerProfile profile) { + this.profile = (profile == null) ? null : CraftPlayerProfile.asAuthlibCopy(profile); + } + + @Nullable + @Override + public PlayerProfile getPlayerProfile() { + return profile != null ? CraftPlayerProfile.asBukkitCopy(profile) : null; + } + // Paper end + @Override public OfflinePlayer getOwningPlayer() { if (hasOwner()) { -- 2.21.0