e284bb1215
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: fb23cbb3 Define surefire plugin version d022084a Define ordering for MetadataStoreTest 99a7f6f0 PR-910: Match generic max absorption attribute name style with the rest c7390d71 PR-909: Update tests to JUnit 5 CraftBukkit Changes: f0661c351 PR-1230: Move unstructured PDC NBT serialisation to SNBT 452fcb599 PR-1256: Update tests to JUnit 5
72 Zeilen
3.6 KiB
Diff
72 Zeilen
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Bjarne Koll <lynxplay101@gmail.com>
|
|
Date: Sat, 6 Nov 2021 23:15:20 +0100
|
|
Subject: [PATCH] Fix setPatternColor on tropical fish bucket meta
|
|
|
|
Prior to this commit, the tropical fish bucket meta would set the body
|
|
color to the previous metas pattern colour when updating the pattern
|
|
colour.
|
|
|
|
This commit hence simply fixes this by using the proper body colour
|
|
value when updating the pattern color.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
|
|
index 581e0f4d68d6eb8eb04449586ffdba35e8b3ad2b..9a045a7793ec20334853a0e1c3529b31899214b3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
|
|
@@ -107,7 +107,7 @@ class CraftMetaTropicalFishBucket extends CraftMetaItem implements TropicalFishB
|
|
if (this.variant == null) {
|
|
this.variant = 0;
|
|
}
|
|
- this.variant = CraftTropicalFish.getData(color, this.getPatternColor(), this.getPattern());
|
|
+ this.variant = CraftTropicalFish.getData(color, this.getBodyColor(), this.getPattern()); // Paper - properly set tropical fish pattern color without mutating body color
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/test/java/io/papermc/paper/inventory/CraftMetaTropicalFishBucketTest.java b/src/test/java/io/papermc/paper/inventory/CraftMetaTropicalFishBucketTest.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..a71e1d488a74dcac70b1dca889181527395be9b5
|
|
--- /dev/null
|
|
+++ b/src/test/java/io/papermc/paper/inventory/CraftMetaTropicalFishBucketTest.java
|
|
@@ -0,0 +1,40 @@
|
|
+package io.papermc.paper.inventory;
|
|
+
|
|
+import org.bukkit.DyeColor;
|
|
+import org.bukkit.Material;
|
|
+import org.bukkit.entity.TropicalFish;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.bukkit.inventory.meta.TropicalFishBucketMeta;
|
|
+import org.bukkit.support.AbstractTestingBase;
|
|
+import org.junit.jupiter.api.Assertions;
|
|
+import org.junit.jupiter.api.Test;
|
|
+
|
|
+public class CraftMetaTropicalFishBucketTest extends AbstractTestingBase {
|
|
+
|
|
+ @Test
|
|
+ public void testAllCombinations() {
|
|
+ final var rawMeta = new ItemStack(Material.TROPICAL_FISH_BUCKET).getItemMeta();
|
|
+ Assertions.assertTrue(rawMeta instanceof TropicalFishBucketMeta, "Meta was not a tropical fish bucket");
|
|
+
|
|
+ final var meta = (TropicalFishBucketMeta) rawMeta;
|
|
+
|
|
+ for (final var bodyColor : DyeColor.values()) {
|
|
+ for (final var pattern : TropicalFish.Pattern.values()) {
|
|
+ for (final var patternColor : DyeColor.values()) {
|
|
+ meta.setBodyColor(bodyColor);
|
|
+ Assertions.assertEquals(bodyColor, meta.getBodyColor(), "Body color did not match post body color!");
|
|
+
|
|
+ meta.setPattern(pattern);
|
|
+ Assertions.assertEquals(pattern, meta.getPattern(), "Pattern did not match post pattern!");
|
|
+ Assertions.assertEquals(bodyColor, meta.getBodyColor(), "Body color did not match post pattern!");
|
|
+
|
|
+ meta.setPatternColor(patternColor);
|
|
+ Assertions.assertEquals(pattern, meta.getPattern(), "Pattern did not match post pattern color!");
|
|
+ Assertions.assertEquals(bodyColor, meta.getBodyColor(), "Body color did not match post pattern color!");
|
|
+ Assertions.assertEquals(patternColor, meta.getPatternColor(), "Pattern color did not match post pattern color!");
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+}
|