twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few issues with ItemMeta (#10740)

Browse Source
This commit is contained in:
Lulu13022002
2024-05-26 00:58:56 +02:00
parent 10c04efb2a
commit f5963e84a3
12 changed files with 872 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
patches/server/Add-ArmorStand-Item-Meta.patch
View File

@@ -154,7 +154,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- return this.entityTag != null ? that.entityTag != null && this.entityTag.equals(that.entityTag) : this.entityTag == null;
+ // Paper start
+ return this.invisible == that.invisible &&
+ return java.util.Objects.equals(this.entityTag, that.entityTag) &&
+ this.invisible == that.invisible &&
+ this.noBasePlate == that.noBasePlate &&
+ this.showArms == that.showArms &&
+ this.small == that.small &&
@@ -164,19 +165,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return true;
}
@@ -0,0 +0,0 @@ public class CraftMetaArmorStand extends CraftMetaItem {
final int original;
int hash = original = super.applyHash();
- if (this.entityTag != null) {
- hash = 73 * hash + this.entityTag.hashCode();
- }
if (this.entityTag != null) {
hash = 73 * hash + this.entityTag.hashCode();
}
+ // Paper start
+ hash += this.entityTag != null ? 73 * hash + this.entityTag.hashCode() : 0;
+ hash += this.isInvisible() ? 61 * hash + 1231 : 0;
+ hash += this.hasNoBasePlate() ? 61 * hash + 1231 : 0;
+ hash += this.shouldShowArms() ? 61 * hash + 1231 : 0;
+ hash += this.isSmall() ? 61 * hash + 1231 : 0;
+ hash += this.isMarker() ? 61 * hash + 1231 : 0;
+ hash = 61 * hash + (this.invisible != null ? Boolean.hashCode(this.isInvisible()) : 0);
+ hash = 61 * hash + (this.noBasePlate != null ? Boolean.hashCode(this.hasNoBasePlate()) : 0);
+ hash = 61 * hash + (this.showArms != null ? Boolean.hashCode(this.shouldShowArms()) : 0);
+ hash = 61 * hash + (this.small != null ? Boolean.hashCode(this.isSmall()) : 0);
+ hash = 61 * hash + (this.marker != null ? Boolean.hashCode(this.isMarker()) : 0);
+ // Paper end
return original != hash ? CraftMetaArmorStand.class.hashCode() ^ hash : hash;