2018-10-05 05:18:46 +02:00
|
|
|
From 9a871f17c9a198eb5bc9b74e789ea310e2fca616 Mon Sep 17 00:00:00 2001
|
2018-01-19 06:38:49 +01:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Fri, 19 Jan 2018 00:36:25 -0500
|
2018-08-06 07:24:55 +02:00
|
|
|
Subject: [PATCH] Add setPlayerProfile API for Skulls
|
2018-01-19 06:38:49 +01:00
|
|
|
|
|
|
|
This allows you to create already filled textures on Skulls to avoid texture lookups
|
|
|
|
which commonly cause rate limit issues with Mojang API
|
|
|
|
|
2018-08-06 07:24:55 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
|
2018-09-07 04:08:35 +02:00
|
|
|
index ad7a2dd170..207546f03a 100644
|
2018-08-06 07:24:55 +02:00
|
|
|
--- 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;
|
2018-09-07 04:08:35 +02:00
|
|
|
@@ -14,6 +16,7 @@ import org.bukkit.block.BlockFace;
|
2018-08-06 07:24:55 +02:00
|
|
|
import org.bukkit.block.Skull;
|
|
|
|
import org.bukkit.block.data.Rotatable;
|
2018-09-07 04:08:35 +02:00
|
|
|
import org.bukkit.craftbukkit.entity.CraftPlayer;
|
2018-08-06 07:24:55 +02:00
|
|
|
+import javax.annotation.Nullable;
|
|
|
|
|
|
|
|
public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implements Skull {
|
|
|
|
|
2018-09-07 04:08:35 +02:00
|
|
|
@@ -104,6 +107,20 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement
|
|
|
|
}
|
2018-08-06 07:24:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // 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() {
|
|
|
|
return ((Rotatable) getBlockData()).getRotation();
|
2018-01-19 06:38:49 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
2018-09-07 04:08:35 +02:00
|
|
|
index 2ea2a355ba..398cf958cc 100644
|
2018-01-19 06:38:49 +01:00
|
|
|
--- 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;
|
2018-09-07 04:08:35 +02:00
|
|
|
@@ -20,6 +22,8 @@ import org.bukkit.inventory.meta.SkullMeta;
|
2018-01-19 06:38:49 +01:00
|
|
|
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 {
|
|
|
|
|
2018-09-07 04:08:35 +02:00
|
|
|
@@ -131,6 +135,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
|
2018-01-19 06:38:49 +01:00
|
|
|
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() {
|
2018-03-23 04:32:55 +01:00
|
|
|
+ return profile != null ? CraftPlayerProfile.asBukkitCopy(profile) : null;
|
2018-01-19 06:38:49 +01:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public OfflinePlayer getOwningPlayer() {
|
|
|
|
if (hasOwner()) {
|
|
|
|
--
|
2018-09-29 01:31:59 +02:00
|
|
|
2.19.0
|
2018-01-19 06:38:49 +01:00
|
|
|
|