mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-03 21:37:28 +01:00
parent
fe5c08d312
commit
476103747a
1 changed files with 18 additions and 0 deletions
|
@ -586,6 +586,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
}
|
||||
|
||||
@Override
|
||||
@@ -0,0 +0,0 @@ public class CraftMetaColorableArmor extends CraftMetaArmor implements Colorable
|
||||
if (meta instanceof CraftMetaColorableArmor) {
|
||||
CraftMetaColorableArmor that = (CraftMetaColorableArmor) meta;
|
||||
|
||||
- return this.color.equals(that.color);
|
||||
+ return this.hasColor() ? that.hasColor() && this.color.equals(that.color) : !that.hasColor(); // Paper - allow null
|
||||
}
|
||||
return true;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCompass.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCompass.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCompass.java
|
||||
|
@ -1163,6 +1172,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
}
|
||||
|
||||
@Override
|
||||
@@ -0,0 +0,0 @@ class CraftMetaLeatherArmor extends CraftMetaItem implements LeatherArmorMeta {
|
||||
if (meta instanceof CraftMetaLeatherArmor) {
|
||||
CraftMetaLeatherArmor that = (CraftMetaLeatherArmor) meta;
|
||||
|
||||
- return this.color.equals(that.color);
|
||||
+ return this.hasColor() ? that.hasColor() && this.color.equals(that.color) : !that.hasColor(); // Paper - allow null
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -0,0 +0,0 @@ class CraftMetaLeatherArmor extends CraftMetaItem implements LeatherArmorMeta {
|
||||
return original != hash ? CraftMetaLeatherArmor.class.hashCode() ^ hash : hash;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue