mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
4bc15f13aa
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: e2160a18 Make MapCursor#type not depends on deprecated values CraftBukkit Changes: 6ce172642 SPIGOT-7761: Ender pearl does not damage or spawn endermites f5a63f734 SPIGOT-7759: Chunk not there when requested in ChunkUnloadEvent 28287259c Remove unused import eb9a7dde0 SPIGOT-7757: Cannot set item in Stonecutter Inventory f8be9d752 Move deserialized removed unhandled tags to dedicated removedTags a7e576186 Fix potential mutability issue with CraftMetaItem copy constructor 995885452 SPIGOT-7741: Vanilla ItemComponent in commands can't remove components 9ef69aa0b PR-1284: Move ItemType <-> ItemMeta linking to a centralized place 3e82eafbe PR-1420: Fix DirectEntity and CausingEntity Damager for Creepers ignited by Player c23daa71f SPIGOT-7751: Fix crash caused by arrows from trial spawners Make MapCursor#type not depends on deprecated values SPIGOT-7761: Ender pearl does not damage or spawn endermites
71 lines
3.6 KiB
Diff
71 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 8169d08c1bccf7c9896bb083eba388f918fac6c9..a514fe98d3d2b65d2cfd029079c69189bcb99c01 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
|
|
@@ -128,7 +128,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!");
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+}
|