Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7510: Try to fix broken reflection usage of plugins

Browse Source
This commit is contained in:
DerFrZocker 2023-10-26 07:37:34 +02:00
parent 6fa69f2357
commit 5a72c3c040
No known key found for this signature in database
GPG Key ID: 713F71FFFE1DDF91
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
View File

@ -139,6 +139,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
super.applyToItem(tag);
if (profile != null) {
checkForInconsistency();
// SPIGOT-6558: Set initial textures
tag.put(SKULL_OWNER.NBT, serializedProfile);
// Fill in textures
@ -283,6 +285,7 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
if (meta instanceof CraftMetaSkull) {
CraftMetaSkull that = (CraftMetaSkull) meta;
checkForInconsistency();
// SPIGOT-5403: equals does not check properties
return (this.profile != null ? that.profile != null && this.serializedProfile.equals(that.serializedProfile) : that.profile == null) && Objects.equals(this.noteBlockSound, that.noteBlockSound);
}
@ -306,4 +309,15 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
}
return builder;
}
private void checkForInconsistency() {
if (profile != null && serializedProfile == null) {
// SPIGOT-7510: Fix broken reflection usage from plugins
Bukkit.getLogger().warning("""
Found inconsistent skull meta, this should normally not happen and is not a Bukkit / Spigot issue, but one from a plugin you are using.
Bukkit will attempt to fix it this time for you, but may not be able to do this every time.
If you see this message after typing a command from a plugin, please report this to the plugin developer, they should use the api instead of relying on reflection (and doing it the wrong way).""");
serializedProfile = GameProfileSerializer.writeGameProfile(new NBTTagCompound(), profile);
}
}
}