diff options
| author | Jake Potrebic <[email protected]> | 2023-10-22 12:12:00 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-10-22 20:12:00 +0100 |
| commit | 90fe0d58a5945c31f2c1b138799f64f2fe3475d8 (patch) | |
| tree | 57e2a8b12dbe8245ce5694dd15af35dc33c3c4c2 /patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch | |
| parent | 489bff9bbdc4215bd2cbc54d837463c608e7747e (diff) | |
| download | Paper-90fe0d58a5945c31f2c1b138799f64f2fe3475d8.tar.gz Paper-90fe0d58a5945c31f2c1b138799f64f2fe3475d8.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9825)
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:
897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry
255b2aa1 SPIGOT-7080: Add World#locateNearestBiome
ff984826 Remove javadoc.io doc links
CraftBukkit Changes:
71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry
a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome
ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag
b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler
38c599f9d PR-1272: Only allow one entity in CraftItem instead of two
f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld
Spigot Changes:
e0e223fe Remove javadoc.io doc links
Diffstat (limited to 'patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch')
| -rw-r--r-- | patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch new file mode 100644 index 0000000000..84ed67d62f --- /dev/null +++ b/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shane Freeder <[email protected]> +Date: Mon, 12 Jul 2021 12:28:29 +0100 +Subject: [PATCH] Use a CHM for StructureTemplate.Pallete cache + +fixes a CME due to this collection being shared across threads + +diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java +index 9f6feac85e8d7266a419bc8c8e11ef976e8f0f83..b56262bdf817de092e49183cd9ded7da55758873 100644 +--- a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java ++++ b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java +@@ -852,7 +852,7 @@ public class StructureTemplate { + public static final class Palette { + + private final List<StructureTemplate.StructureBlockInfo> blocks; +- private final Map<Block, List<StructureTemplate.StructureBlockInfo>> cache = Maps.newHashMap(); ++ private final Map<Block, List<StructureTemplate.StructureBlockInfo>> cache = Maps.newConcurrentMap(); // Paper + + Palette(List<StructureTemplate.StructureBlockInfo> infos) { + this.blocks = infos; |