mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-30 08:44:53 +02:00
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
72 lines
3.6 KiB
Diff
72 lines
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 a4256ee1c1cd305d1253e7b8084d814428386369..67c56a4f643e1cb52139c8f3ffc4af0cf278339f 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!");
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+}
|