aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff options
context:
space:
mode:
authormaxcom1 <[email protected]>2024-03-23 22:26:17 +0100
committerGitHub <[email protected]>2024-03-23 17:26:17 -0400
commitb6001403e9703cadaa6e8c8558e732b91c3c6d6e (patch)
treea8c57bbc334a8ad48d4ad2b43db335667b142bee /patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
parent9ec7dfcbc41c6e625de0050b6997160a75df9f44 (diff)
downloadPaper-b6001403e9703cadaa6e8c8558e732b91c3c6d6e.tar.gz
Paper-b6001403e9703cadaa6e8c8558e732b91c3c6d6e.zip
Add methods to change entity physics (#10334)
Diffstat (limited to 'patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch')
-rw-r--r--patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
new file mode 100644
index 0000000000..1b86e32b63
--- /dev/null
+++ b/patches/server/0697-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 75ba5a7fe002b5834f12e3a1159c15e6166c9c28..be8aab51a1b92a3a0cc94976975fc3aabc46f0b4 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 - Fix CME due to this collection being shared across threads
+
+ Palette(List<StructureTemplate.StructureBlockInfo> infos) {
+ this.blocks = infos;