aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0659-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0659-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch')
-rw-r--r--patches/server/0659-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/patches/server/0659-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0659-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
new file mode 100644
index 0000000000..82d25835a6
--- /dev/null
+++ b/patches/server/0659-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 02b493435509f7a84a2c26050ca0c732ecf00ca0..33564e62e3181d28b18a957e28b8ec5152d8339f 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
+@@ -859,7 +859,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 - Fix CME due to this collection being shared across threads
+
+ Palette(List<StructureTemplate.StructureBlockInfo> infos) {
+ this.blocks = infos;