aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2025-04-12 16:16:14 +0800
committershedaniel <daniel@shedaniel.me>2025-04-12 16:16:14 +0800
commit098fb7b5dae7bbe4a7dc439e90455e4d9d2359ed (patch)
treea313339b31f07b9a5ccc70adcf9ca533986956d5
parentade79d9a271916885c758632c01d4f7195803a2c (diff)
downloadRoughlyEnoughItems-098fb7b5dae7bbe4a7dc439e90455e4d9d2359ed.tar.gz
RoughlyEnoughItems-098fb7b5dae7bbe4a7dc439e90455e4d9d2359ed.tar.bz2
RoughlyEnoughItems-098fb7b5dae7bbe4a7dc439e90455e4d9d2359ed.zip
Fix display history respawn after removing
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayHistoryManager.java6
1 files changed, 3 insertions, 3 deletions
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());
}