geforkt von Mirrors/Paper
SPIGOT-2537: Relax skull check even for nominally invalid skulls.
By: md_5 <git@md-5.net>
Dieser Commit ist enthalten in:
Ursprung
234b54be67
Commit
9baef28a81
@ -1,21 +1,16 @@
|
|||||||
--- 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;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (!valid) {
|
|
||||||
+ nbttagcompound.remove("SkullOwner");
|
+ nbttagcompound.remove("SkullOwner");
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+ // CraftBukkit end
|
+ // CraftBukkit end
|
||||||
return false;
|
return false;
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren