core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lookup game profiles for users that aren't onine

This commit is contained in:
Techcable 2015-08-15 14:05:03 -05:00 committed by Zach Brown
parent a16e54d332
commit 25a137f3a3
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Spigot-Server-Patches/0072-Use-UserCache-for-player-heads.patch
View File

@ -1,20 +1,34 @@
From 6dd08c1be604a9ad98efafa34b8de83bf4412127 Mon Sep 17 00:00:00 2001
From af94e290f2676a9b138658b543a939906cc8b693 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Fri, 7 Aug 2015 19:31:31 -0700
Subject: [PATCH] Use UserCache for player heads
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
index ce5425f..e8460bf 100644
index ce5425f..25e32a0 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
@@ -132,7 +132,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
@@ -6,6 +6,11 @@ import net.minecraft.server.GameProfileSerializer;
import net.minecraft.server.NBTBase;
import net.minecraft.server.NBTTagCompound;
+// PaperSpigot start
+import net.minecraft.server.EntityPlayer;
+import net.minecraft.server.MinecraftServer;
+// PaperSpigot end
+
import org.bukkit.Material;
import org.bukkit.configuration.serialization.DelegateDeserialization;
import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta;
@@ -132,7 +137,10 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
if (name == null) {
profile = null;
} else {
- profile = new GameProfile(null, name);
+ // PaperSpigot - Check usercache for the profile
+ profile = net.minecraft.server.MinecraftServer.getServer().getUserCache().getProfile(name);
+ // PaperSpigot start - Check usercache if the player is online
+ EntityPlayer player = MinecraftServer.getServer().getPlayerList().getPlayer(name);
+ profile = player != null ? player.getProfile() : new GameProfile(null, name);
+ // PaperSpigot end
}
return true;