OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-10 03:52:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-2520: Better skull validation

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2016-07-13 11:47:57 +10:00
parent a9eb9b3f1a
commit 1e7be02c6b
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
paper-server/nms-patches/ItemSkull.patch
View file

@ -1,10 +1,23 @@
--- 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,7 @@ @@ -117,6 +117,20 @@
nbttagcompound.set("SkullOwner", GameProfileSerializer.serialize(new NBTTagCompound(), gameprofile)); nbttagcompound.set("SkullOwner", GameProfileSerializer.serialize(new NBTTagCompound(), gameprofile));
return true; return true;
} else { } else {
+ nbttagcompound.remove("SkullOwner"); // CraftBukkit - remove broken skulls + // CraftBukkit start
+ boolean valid = true;
+
+ NBTTagList textures = nbttagcompound.getCompound("SkullOwner").getCompound("Properties").getList("textures", 10); // Safe due to method contracts
+ for (int i = 0; i < textures.size(); i++) {
+ if (textures.get(i) instanceof NBTTagCompound && !((NBTTagCompound) textures.get(i)).hasKeyOfType("Signature", 8)) {
+ valid = false;
+ }
+ }
+
+ if (!valid) {
+ nbttagcompound.remove("SkullOwner");
+ }
+ // CraftBukkit end
return false; return false;
} }
} }