From c4e7d694c1be8b46e9ddc6b8c3fda863e9cea5db Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 12 Oct 2023 22:31:35 -0700 Subject: [PATCH] Fix potential threading issue when registering CriteriaTriggers. Closes #9745 --- .../advancements/CriteriaTriggers.java.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 patches/minecraft/net/minecraft/advancements/CriteriaTriggers.java.patch diff --git a/patches/minecraft/net/minecraft/advancements/CriteriaTriggers.java.patch b/patches/minecraft/net/minecraft/advancements/CriteriaTriggers.java.patch new file mode 100644 index 0000000000..fe36b86807 --- /dev/null +++ b/patches/minecraft/net/minecraft/advancements/CriteriaTriggers.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/advancements/CriteriaTriggers.java ++++ b/net/minecraft/advancements/CriteriaTriggers.java +@@ -46,7 +_,7 @@ + import net.minecraft.resources.ResourceLocation; + + public class CriteriaTriggers { +- private static final BiMap> CRITERIA = HashBiMap.create(); ++ private static final BiMap> CRITERIA = com.google.common.collect.Maps.synchronizedBiMap(HashBiMap.create()); + public static final ImpossibleTrigger IMPOSSIBLE = register("impossible", new ImpossibleTrigger()); + public static final KilledTrigger PLAYER_KILLED_ENTITY = register("player_killed_entity", new KilledTrigger()); + public static final KilledTrigger ENTITY_KILLED_PLAYER = register("entity_killed_player", new KilledTrigger());