From 098fb7b5dae7bbe4a7dc439e90455e4d9d2359ed Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 12 Apr 2025 16:16:14 +0800
Subject: Fix display history respawn after removing

---
 .../client/gui/widget/favorites/history/DisplayHistoryManager.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime/src')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayHistoryManager.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayHistoryManager.java
index 6f77570f3..e975e85c7 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayHistoryManager.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayHistoryManager.java
@@ -118,7 +118,7 @@ public class DisplayHistoryManager {
         this.entries.remove(entry.getUuid().toString());
         this.displayToEntries.remove(entry.getDisplay());
         List<CompoundTag> displayHistory = ConfigManagerImpl.getInstance().getConfig().getDisplayHistory();
-        displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").equals(entry.getUuid().toString()));
+        displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").orElse(null).equals(entry.getUuid().toString()));
         save();
     }
     
@@ -128,7 +128,7 @@ public class DisplayHistoryManager {
         while (iterator.hasNext()) {
             DisplayEntry entry = iterator.next();
             if (entry.getDisplay() == display) {
-                displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").equals(entry.getUuid().toString()));
+                displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").orElse(null).equals(entry.getUuid().toString()));
                 this.displayToEntries.remove(entry.getDisplay());
                 iterator.remove();
             }
@@ -144,7 +144,7 @@ public class DisplayHistoryManager {
         }
         while (entries.size() >= 10) {
             DisplayEntry entry = Iterables.get(entries.values(), entries.size() - 1);
-            displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").equals(entry.getUuid().toString()));
+            displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").orElse(null).equals(entry.getUuid().toString()));
             this.entries.remove(entry.getUuid().toString());
             this.displayToEntries.remove(entry.getDisplay());
         }
-- 
cgit