diff options
| author | Lulu13022002 <[email protected]> | 2024-08-10 15:08:00 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-08-10 15:08:00 +0200 |
| commit | 70dfa467e796a0dfaf74147fe3560e07a5816054 (patch) | |
| tree | 0368cee2c48d858369bd30f24b9f4e4314d964a6 /patches/server/0966-General-ItemMeta-fixes.patch | |
| parent | 306d0dfdf09eefe34028b82542a94dea606f7cbe (diff) | |
| download | Paper-70dfa467e796a0dfaf74147fe3560e07a5816054.tar.gz Paper-70dfa467e796a0dfaf74147fe3560e07a5816054.zip | |
Fix CraftMetaShield equality (#11232)
Diffstat (limited to 'patches/server/0966-General-ItemMeta-fixes.patch')
| -rw-r--r-- | patches/server/0966-General-ItemMeta-fixes.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0966-General-ItemMeta-fixes.patch b/patches/server/0966-General-ItemMeta-fixes.patch index 220ff9693e..81edf89f6d 100644 --- a/patches/server/0966-General-ItemMeta-fixes.patch +++ b/patches/server/0966-General-ItemMeta-fixes.patch @@ -1388,7 +1388,7 @@ index 7f9182809f6e67ff571db0f365bc7e05f600775a..01c49df291f721bab3acb788ff2f2787 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaShield.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaShield.java -index 967d8940aec0065bce496d5d7a8c73de5733bd2c..57a2dc0581d1e59ce201d84ca0c0f7606577bf4c 100644 +index 967d8940aec0065bce496d5d7a8c73de5733bd2c..e229ca6acb6dbc3185f326f6653b3d66d835a9e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaShield.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaShield.java @@ -28,17 +28,29 @@ public class CraftMetaShield extends CraftMetaItem implements ShieldMeta, BlockS @@ -1618,7 +1618,7 @@ index 967d8940aec0065bce496d5d7a8c73de5733bd2c..57a2dc0581d1e59ce201d84ca0c0f760 } if (meta instanceof CraftMetaShield that) { - return Objects.equal(this.banner, that.banner); -+ return Objects.equal(this.baseColor, that.baseColor) && Objects.equal(this.hasPatterns(), that.hasPatterns()); // Paper - general item meta fixes - decoupled base colour and patterns ++ return Objects.equal(this.baseColor, that.baseColor) && Objects.equal(this.patterns, that.patterns); // Paper - general item meta fixes - decoupled base colour and patterns } return true; } |