From ba5473454e22cabe6fa8366877777a54ce9506b5 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sun, 19 Jun 2022 02:49:23 +0800
Subject: Synchronize DisplayRegistry displays

---
 .../rei/impl/client/registry/display/DisplayRegistryImpl.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime/src/main/java')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
index d0af46480..c8a35f540 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
@@ -57,7 +57,7 @@ import java.util.function.UnaryOperator;
 
 public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugin> implements DisplayRegistry {
     private final WeakHashMap<Display, Object> displaysBase = new WeakHashMap<>();
-    private final Map<CategoryIdentifier<?>, DisplaysList> displays = new ConcurrentHashMap<>();
+    private final Map<CategoryIdentifier<?>, List<Display>> displays = new ConcurrentHashMap<>();
     private final Map<CategoryIdentifier<?>, List<Display>> unmodifiableDisplays;
     private final Map<CategoryIdentifier<?>, List<DynamicDisplayGenerator<?>>> displayGenerators = new ConcurrentHashMap<>();
     private final List<DynamicDisplayGenerator<?>> globalDisplayGenerators = new ArrayList<>();
@@ -131,9 +131,11 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
     
     private static class DisplaysList extends ArrayList<Display> {
         private final List<Display> unmodifiableList;
+        private final List<Display> synchronizedList;
         
         public DisplaysList() {
-            this.unmodifiableList = Collections.unmodifiableList(this);
+            this.synchronizedList = Collections.synchronizedList(this);
+            this.unmodifiableList = Collections.unmodifiableList(synchronizedList);
         }
     }
     
@@ -160,7 +162,7 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
             }
         }
         
-        displays.computeIfAbsent(display.getCategoryIdentifier(), location -> new DisplaysList())
+        displays.computeIfAbsent(display.getCategoryIdentifier(), location -> new DisplaysList().synchronizedList)
                 .add(display);
         displayCount.increment();
         if (origin != null) {
-- 
cgit