mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
01a13871de
Patch documentation to come Issues with the old system that are fixed now: - World generation does not scale with cpu cores effectively. - Relies on the main thread for scheduling and maintaining chunk state, dropping chunk load/generate rates at lower tps. - Unreliable prioritisation of chunk gen/load calls that block the main thread. - Shutdown logic is utterly unreliable, as it has to wait for all chunks to unload - is it guaranteed that the chunk system is in a state on shutdown that it can reliably do this? Watchdog shutdown also typically failed due to thread checks, which is now resolved. - Saving of data is not unified (i.e can save chunk data without saving entity data, poses problems for desync if shutdown is really abnormal. - Entities are not loaded with chunks. This caused quite a bit of headache for Chunk#getEntities API, but now the new chunk system loads entities with chunks so that they are ready whenever the chunk loads in. Effectively brings the behavior back to 1.16 era, but still storing entities in their own separate regionfiles. The above list is not complete. The patch documentation will complete it. New chunk system hard relies on starlight and dataconverter, and most importantly the new concurrent utilities in ConcurrentUtil. Some of the old async chunk i/o interface (i.e the old file io thread reroutes _some_ calls to the new file io thread) is kept for plugin compat reasons. It will be removed in the next major version of minecraft. The old legacy chunk system patches have been moved to the removed folder in case we need them again.
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 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..2e7f8ef88ae74c7cbfdb7f397951cbc8479a995f
|
|
--- /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.Assert;
|
|
+import org.junit.Test;
|
|
+
|
|
+public class CraftMetaTropicalFishBucketTest extends AbstractTestingBase {
|
|
+
|
|
+ @Test
|
|
+ public void testAllCombinations() {
|
|
+ final var rawMeta = new ItemStack(Material.TROPICAL_FISH_BUCKET).getItemMeta();
|
|
+ Assert.assertTrue("Meta was not a tropical fish bucket", rawMeta instanceof TropicalFishBucketMeta);
|
|
+
|
|
+ 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);
|
|
+ Assert.assertEquals("Body color did not match post body color!", bodyColor, meta.getBodyColor());
|
|
+
|
|
+ meta.setPattern(pattern);
|
|
+ Assert.assertEquals("Pattern did not match post pattern!", pattern, meta.getPattern());
|
|
+ Assert.assertEquals("Body color did not match post pattern!", bodyColor, meta.getBodyColor());
|
|
+
|
|
+ meta.setPatternColor(patternColor);
|
|
+ Assert.assertEquals("Pattern did not match post pattern color!", pattern, meta.getPattern());
|
|
+ Assert.assertEquals("Body color did not match post pattern color!", bodyColor, meta.getBodyColor());
|
|
+ Assert.assertEquals("Pattern color did not match post pattern color!", patternColor, meta.getPatternColor());
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+}
|