From 2e46c8db867ee731830e69c860abd2fca4ede22a Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Fri, 9 Feb 2024 02:24:55 -0800 Subject: [PATCH] Fix some maps not loading properly --- src/main/java/emu/lunarcore/data/ResourceLoader.java | 6 ++++++ src/main/java/emu/lunarcore/data/config/FloorInfo.java | 1 + 2 files changed, 7 insertions(+) diff --git a/src/main/java/emu/lunarcore/data/ResourceLoader.java b/src/main/java/emu/lunarcore/data/ResourceLoader.java index ba67226..3c7af4d 100644 --- a/src/main/java/emu/lunarcore/data/ResourceLoader.java +++ b/src/main/java/emu/lunarcore/data/ResourceLoader.java @@ -205,6 +205,12 @@ public class ResourceLoader { // Load group infos for (FloorInfo floor : GameData.getFloorInfos().values()) { for (FloorGroupSimpleInfo simpleGroup : floor.getSimpleGroupList()) { + // Dont load "deprecated" groups + if (simpleGroup.isIsDelete()) { + continue; + } + + // Get file from resource directory File file = new File(LunarCore.getConfig().getResourceDir() + "/" + simpleGroup.getGroupPath()); if (!file.exists()) continue; diff --git a/src/main/java/emu/lunarcore/data/config/FloorInfo.java b/src/main/java/emu/lunarcore/data/config/FloorInfo.java index 754e0fd..73c9006 100644 --- a/src/main/java/emu/lunarcore/data/config/FloorInfo.java +++ b/src/main/java/emu/lunarcore/data/config/FloorInfo.java @@ -88,6 +88,7 @@ public class FloorInfo { @Getter public static class FloorGroupSimpleInfo { private String GroupPath; + private boolean IsDelete; private int ID; } }