Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
md_5 2016-07-22 20:34:17 +10:00
parent 7ae605218b
commit f5d891f609
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nms-patches/ItemSkull.patch
View File

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