Spigot / CraftBukkit / f5d891f609a

Commits

md_5 authored f5d891f609a 22 Jul 2016

SPIGOT-2537: Relax skull check even for nominally invalid skulls.

Modified

-1
+--- a/net/minecraft/server/ItemSkull.java
-2
++++ b/net/minecraft/server/ItemSkull.java
--
+@@ -117,6 +117,20 @@
-+
+@@ -117,6 +117,15 @@
-4
+             nbttagcompound.set("SkullOwner", GameProfileSerializer.serialize(new NBTTagCompound(), gameprofile));
-5
+             return true;
-6
+         } else {
-7
++            // CraftBukkit start
--
++            boolean valid = true;
--
++
-8
++            NBTTagList textures = nbttagcompound.getCompound("SkullOwner").getCompound("Properties").getList("textures", 10); // Safe due to method contracts
-9
++            for (int i = 0; i < textures.size(); i++) {
--
++                if (textures.get(i) instanceof NBTTagCompound && !((NBTTagCompound) textures.get(i)).hasKeyOfType("Signature", 8)) {
--
++                    valid = false;
-+
++                if (textures.get(i) instanceof NBTTagCompound && !((NBTTagCompound) textures.get(i)).hasKeyOfType("Signature", 8) && ((NBTTagCompound) textures.get(i)).getString("Value").trim().isEmpty()) {
-+
++                    nbttagcompound.remove("SkullOwner");
-+
++                    break;
-13
++                }
-14
++            }
--
++
--
++            if (!valid) {
--
++                nbttagcompound.remove("SkullOwner");
--
++            }
-15
++            // CraftBukkit end
-16
+             return false;
-17
+         }
-18
+     }