From 42fe38c2aab7283fae1a6e9cf9029252ec9cb899 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 13 Feb 2026 11:17:43 -0500 Subject: [PATCH] Fixed improperly initialized mods crashing the database --- core/src/mindustry/ui/dialogs/DatabaseDialog.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/mindustry/ui/dialogs/DatabaseDialog.java index 74d657580d..22205bcf1d 100644 --- a/core/src/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/mindustry/ui/dialogs/DatabaseDialog.java @@ -84,11 +84,15 @@ public class DatabaseDialog extends BaseDialog{ for(var contents : allContent){ for(var content : contents){ if(content instanceof UnlockableContent u){ - var categoryContents = sortedContents.get(u.databaseCategory == null ? u.getContentType().name() : u.databaseCategory, new OrderedMap<>()); - var taggedContents = categoryContents.get(u.databaseTag == null ? "default" : u.databaseTag, new Seq<>()); + //some mods don't initialize these properly + String cat = u.databaseCategory == null ? u.getContentType().name() : u.databaseCategory; + String tag = u.databaseTag == null ? "default" : u.databaseTag; + + var categoryContents = sortedContents.get(cat, new OrderedMap<>()); + var taggedContents = categoryContents.get(tag, new Seq<>()); taggedContents.add(u); - categoryContents.put(u.databaseTag, taggedContents); - sortedContents.put(u.databaseCategory, categoryContents); + categoryContents.put(tag, taggedContents); + sortedContents.put(cat, categoryContents); } } }