Black Hole / Spigot / bb614f84146

Commits

md_5 authored bb614f84146 01 Jan 2018

SPIGOT-3724: Skull fixes from CraftBukkit

CraftBukkit-Patches/0087-Convert-player-skulls-async.patch

Modified

--
+From 216a5be97ac0a288850345b677a787dfd98dcfd2 Mon Sep 17 00:00:00 2001
-+
+From 292bf189c31ce52e14f8d724767a5ea534a91a45 Mon Sep 17 00:00:00 2001
-2
+From: Thinkofdeath <thethinkofdeath@gmail.com>
-3
+Date: Sun, 20 Apr 2014 13:18:55 +0100
-4
+Subject: [PATCH] Convert player skulls async
-5
-6
-7
+diff --git a/src/main/java/net/minecraft/server/ItemSkull.java b/src/main/java/net/minecraft/server/ItemSkull.java
--
+index cbb902f50..bd99b5a18 100644
-+
+index cbb902f50..ca33c9c13 100644
-9
+--- a/src/main/java/net/minecraft/server/ItemSkull.java
-10
++++ b/src/main/java/net/minecraft/server/ItemSkull.java
-11
+@@ -124,13 +124,21 @@ public class ItemSkull extends Item {
-12
+         return super.b(itemstack);
-13
+     }
-14
-15
+-    public boolean a(NBTTagCompound nbttagcompound) {
-16
++    public boolean a(final NBTTagCompound nbttagcompound) { // Spigot - make final
-17
+         super.a(nbttagcompound);
-18
+         if (nbttagcompound.hasKeyOfType("SkullOwner", 8) && !StringUtils.isBlank(nbttagcompound.getString("SkullOwner"))) {
-19
+             GameProfile gameprofile = new GameProfile((UUID) null, nbttagcompound.getString("SkullOwner"));
-20
-21
+-            gameprofile = TileEntitySkull.b(gameprofile);
-22
+-            nbttagcompound.set("SkullOwner", GameProfileSerializer.serialize(new NBTTagCompound(), gameprofile));
-23
++            // Spigot start
-24
++            TileEntitySkull.b(gameprofile, new com.google.common.base.Predicate<GameProfile>() {
-25
++
-26
++                @Override
-27
++                public boolean apply(GameProfile gameprofile) {
--
++                    nbttagcompound.set("SkullOwner", GameProfileSerializer.serialize(new NBTTagCompound(), gameprofile));
-+
++                    nbttagcompound.set("SkullOwner", GameProfileSerializer.serialize(new NBTTagCompound(), gameprofile));
-29
++                    return false;
-30
++                }
-31
++            });
-32
++            // Spigot end
-33
+             return true;
-34
+         } else {
-35
+             // CraftBukkit start
-36
+diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
--
+index 223e2ed2d..fd08e0bdc 100644
-+
+index 223e2ed2d..1e3c687d6 100644
-38
+--- a/src/main/java/net/minecraft/server/TileEntitySkull.java
-39
++++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
--
+@@ -7,6 +7,20 @@ import com.mojang.authlib.properties.Property;
-+
+@@ -7,6 +7,23 @@ import com.mojang.authlib.properties.Property;
-41
+ import java.util.UUID;
-42
+ import javax.annotation.Nullable;
-43
-44
++// Spigot start
-45
++import com.google.common.base.Predicate;
-46
++import com.google.common.cache.LoadingCache;
-47
++import com.google.common.cache.CacheBuilder;
-48
++import com.google.common.cache.CacheLoader;
--
++import java.util.concurrent.Executor;
-+
++import com.google.common.util.concurrent.Futures;
-50
++import java.util.concurrent.Executors;
-+
++import java.util.concurrent.ExecutorService;
-+
++import java.util.concurrent.Future;
-53
++import java.util.concurrent.TimeUnit;
-54
++
-55
++import com.google.common.util.concurrent.ThreadFactoryBuilder;
-56
++import com.mojang.authlib.Agent;
-57
++import com.mojang.authlib.ProfileLookupCallback;
-+
++import java.util.concurrent.Callable;
-59
++// Spigot end
-60
++
-61
+ public class TileEntitySkull extends TileEntity implements ITickable {
-62
-63
+     private int a;
--
+@@ -16,6 +30,58 @@ public class TileEntitySkull extends TileEntity implements ITickable {
-+
+@@ -16,6 +33,58 @@ public class TileEntitySkull extends TileEntity implements ITickable {
-65
+     private boolean i;
-66
+     private static UserCache j;
-67
+     private static MinecraftSessionService k;
-68
++    // Spigot start
--
++    public static final Executor executor = Executors.newFixedThreadPool(3,
-+
++    public static final ExecutorService executor = Executors.newFixedThreadPool(3,
-70
++            new ThreadFactoryBuilder()
-71
++                    .setNameFormat("Head Conversion Thread - %1$d")
-72
++                    .build()
-73
++    );
-74
++    public static final LoadingCache<String, GameProfile> skinCache = CacheBuilder.newBuilder()
-75
++            .maximumSize( 5000 )
-76
++            .expireAfterAccess( 60, TimeUnit.MINUTES )
-77
++            .build( new CacheLoader<String, GameProfile>()
-78
++            {
-79
++                @Override
-113
++                    }
-114
++
-115
++
-116
++                    return profile;
-117
++                }
-118
++            } );
-119
++    // Spigot end
-120
-121
+     public TileEntitySkull() {}
-122
--
+@@ -98,35 +164,60 @@ public class TileEntitySkull extends TileEntity implements ITickable {
-+
+@@ -98,35 +167,65 @@ public class TileEntitySkull extends TileEntity implements ITickable {
-124
+     }
-125
-126
+     private void i() {
-127
+-        this.g = b(this.g);
-128
+-        this.update();
-129
++        // Spigot start
-130
++        GameProfile profile = this.g;
-131
++        setSkullType( 0 ); // Work around client bug
-132
++        b(profile, new Predicate<GameProfile>() {
-133
++
-140
++                    world.m(position); // PAIL: notify
-141
++                }
-142
++                return false;
-143
++            }
-144
++        });
-145
++        // Spigot end
-146
+     }
-147
-148
+-    public static GameProfile b(GameProfile gameprofile) {
-149
++    // Spigot start - Support async lookups
--
++    public static void b(final GameProfile gameprofile, final Predicate<GameProfile> callback) {
-+
++    public static Future<GameProfile> b(final GameProfile gameprofile, final Predicate<GameProfile> callback) {
-151
+         if (gameprofile != null && !UtilColor.b(gameprofile.getName())) {
-152
+             if (gameprofile.isComplete() && gameprofile.getProperties().containsKey("textures")) {
-153
+-                return gameprofile;
-154
+-            } else if (TileEntitySkull.j != null && TileEntitySkull.k != null) {
-155
+-                GameProfile gameprofile1 = TileEntitySkull.j.getProfile(gameprofile.getName());
 -
--
+-                if (gameprofile1 == null) {
--
+-                    return gameprofile;
-156
++                callback.apply(gameprofile);
-157
++            } else if (MinecraftServer.getServer() == null) {
-158
++                callback.apply(gameprofile);
-159
++            } else {
-160
++                GameProfile profile = skinCache.getIfPresent(gameprofile.getName().toLowerCase(java.util.Locale.ROOT));
-161
++                if (profile != null && Iterables.getFirst(profile.getProperties().get("textures"), (Object) null) != null) {
-162
++                    callback.apply(profile);
-+
-+
+-                if (gameprofile1 == null) {
-+
+-                    return gameprofile;
-+
++                    return Futures.immediateFuture(profile);
-167
+                 } else {
-168
+-                    Property property = (Property) Iterables.getFirst(gameprofile1.getProperties().get("textures"), (Object) null);
-169
+-
-170
+-                    if (property == null) {
-171
+-                        gameprofile1 = TileEntitySkull.k.fillProfileProperties(gameprofile1, true);
-172
+-                    }
-173
+-
-174
+-                    return gameprofile1;
--
++                    executor.execute(new Runnable() {
-+
++                    return executor.submit(new Callable<GameProfile>() {
-176
++                        @Override
--
++                        public void run() {
-+
++                        public GameProfile call() {
-178
++                            final GameProfile profile = skinCache.getUnchecked(gameprofile.getName().toLowerCase(java.util.Locale.ROOT));
-179
++                            MinecraftServer.getServer().processQueue.add(new Runnable() {
-180
++                                @Override
-181
++                                public void run() {
-182
++                                    if (profile == null) {
-183
++                                        callback.apply(gameprofile);
-184
++                                    } else {
-185
++                                        callback.apply(profile);
-186
++                                    }
-187
++                                }
-188
++                            });
-+
++                            return profile;
-190
++                        }
-191
++                    });
-192
+                 }
-193
+-            } else {
-194
+-                return gameprofile;
-195
+             }
-196
+         } else {
-197
+-            return gameprofile;
-198
++            callback.apply(gameprofile);
-199
+         }
 +
-+
++        return Futures.immediateFuture(gameprofile);
-202
+     }
-203
++    // Spigot end
-204
-205
+     public int getSkullType() {
-206
+         return this.a;
-207
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
--
+index fbc16890c..4976eb26a 100644
-+
+index 8c5d3effc..8a58615f8 100644
-209
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-210
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
--
+@@ -5,6 +5,7 @@ import java.util.Map;
--
+ import net.minecraft.server.GameProfileSerializer;
--
+ import net.minecraft.server.NBTBase;
--
+ import net.minecraft.server.NBTTagCompound;
--
++import net.minecraft.server.TileEntitySkull;
--
--
+ import org.bukkit.Bukkit;
--
+ import org.bukkit.Material;
--
+@@ -71,13 +72,27 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
--
+     }
--
--
+     @Override
--
+-    void applyToItem(NBTTagCompound tag) {
--
++    void applyToItem(final NBTTagCompound tag) { // Spigot - make final
--
+         super.applyToItem(tag);
-+
+@@ -77,7 +77,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
-212
-213
+         if (profile != null) {
-+
+             // Fill in textures
-+
+-            profile = TileEntitySkull.b(profile);
-+
++            // Must be done sync due to way client handles textures
-+
++            profile = com.google.common.util.concurrent.Futures.getUnchecked(TileEntitySkull.b(profile, com.google.common.base.Predicates.alwaysTrue())); // Spigot
-+
-219
+             NBTTagCompound owner = new NBTTagCompound();
-220
+             GameProfileSerializer.serialize(owner, profile);
--
+-            tag.set(SKULL_OWNER.NBT, owner);
--
++            tag.set( SKULL_OWNER.NBT, owner );
--
++            // Spigot start - do an async lookup of the profile.
--
++            // Unfortunately there is not way to refresh the holding
--
++            // inventory, so that responsibility is left to the user.
--
++            net.minecraft.server.TileEntitySkull.b(profile, new com.google.common.base.Predicate<GameProfile>() {
--
++
--
++                @Override
--
++                public boolean apply(GameProfile input) {
--
++                    NBTTagCompound owner = new NBTTagCompound();
--
++                    GameProfileSerializer.serialize( owner, input );
--
++                    tag.set( SKULL_OWNER.NBT, owner );
--
++                    return false;
--
++                }
--
++            });
--
++            // Spigot end
--
+         }
--
+     }
--
--
+@@ -136,7 +151,10 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
--
+         if (name == null) {
--
+             profile = null;
--
+         } else {
--
+-            profile = new GameProfile(null, name);
--
++            // Spigot start
--
++            profile = TileEntitySkull.skinCache.getIfPresent(name.toLowerCase(java.util.Locale.ROOT));
--
++            if (profile == null) profile = new GameProfile(null, name);
--
++            // Spigot end
--
+         }
--
--
+         return true;
-221
+--
-222
+.14.1
-223

Spigot

Commits

Jira Issues

Add shortcut