Skip to content

Commit 17eb884

Browse files
committed
Use a CHM for StructureTemplate.Pallete cache
fixes a CME due to this collection being shared across threads This patch was in 1.16.5 for a good while and noticed somebody getting impacted by the same thing
1 parent 3109dd8 commit 17eb884

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Shane Freeder <theboyetronic@gmail.com>
3+
Date: Mon, 12 Jul 2021 12:28:29 +0100
4+
Subject: [PATCH] Use a CHM for StructureTemplate.Pallete cache
5+
6+
fixes a CME due to this collection being shared across threads
7+
8+
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
9+
index ef8dd3fa4f7ac8f85ae508999264850659bf9606..ac80779956ac2f8aa83166d3d2282352ebe1901d 100644
10+
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
11+
+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
12+
@@ -831,7 +831,7 @@ public class StructureTemplate {
13+
public static final class Palette {
14+
15+
private final List<StructureTemplate.StructureBlockInfo> blocks;
16+
- private final Map<Block, List<StructureTemplate.StructureBlockInfo>> cache = Maps.newHashMap();
17+
+ private final Map<Block, List<StructureTemplate.StructureBlockInfo>> cache = Maps.newConcurrentMap(); // Paper
18+
19+
Palette(List<StructureTemplate.StructureBlockInfo> infos) {
20+
this.blocks = infos;

0 commit comments

Comments
 (0)