Fix #977

1 files changed, 14 insertions, 8 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
index a44eeef7c..0318f692c 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
@@ -313,17 +313,23 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget {
             return null;
         }
         
-        for (List<Display> displays : DisplayRegistry.getInstance().getAll().values()) {
-            for (Display display : displays) {
-                if (ViewsImpl.isRecipesFor(getEntries(), display)) {
-                    AutoCraftingEvaluator.AutoCraftingResult result = AutoCraftingEvaluator.evaluateAutoCrafting(false, false, display, null);
-                    if (result.successful) {
-                        this.display = display;
-                        this.displayTooltipComponent = Suppliers.memoize(() -> new DisplayTooltipComponent(display));
-                        return result.successfulHandler;
+        try {
+            for (List<Display> displays : DisplayRegistry.getInstance().getAll().values()) {
+                for (Display display : displays) {
+                    if (ViewsImpl.isRecipesFor(getEntries(), display)) {
+                        AutoCraftingEvaluator.AutoCraftingResult result = AutoCraftingEvaluator.evaluateAutoCrafting(false, false, display, null);
+                        if (result.successful) {
+                            this.display = display;
+                            this.displayTooltipComponent = Suppliers.memoize(() -> new DisplayTooltipComponent(display));
+                            return result.successfulHandler;
+                        }
                     }
                 }
             }
+        } catch (ConcurrentModificationException ignored) {
+            display = null;
+            displayTooltipComponent = null;
+            lastCheckTime = -1;
         }
         
         return null;