diff options
| author | booky10 <[email protected]> | 2023-11-04 20:20:01 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-11-04 20:20:01 +0100 |
| commit | f78d7ce8ffb7e4b6fd5ee256f5e3678ea04fd807 (patch) | |
| tree | 8e7abee5129e15a919630824c4f194a2811f7242 /patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch | |
| parent | 44057da46727138e19d951b56e98ad8c25c1f869 (diff) | |
| download | Paper-f78d7ce8ffb7e4b6fd5ee256f5e3678ea04fd807.tar.gz Paper-f78d7ce8ffb7e4b6fd5ee256f5e3678ea04fd807.zip | |
Remove "fix-curing-zombie-villager-discount" exploit option (#9895)
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; |