Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 01:46:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix entity controllers not loading

Browse Source 
elemental monuments should now work
This commit is contained in:
KingRainbow44
2023-04-15 01:41:19 -04:00
parent 2b4feba86f
commit d8f90b26cf
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/grasscutter/data/ResourceLoader.java
View File

@@ -23,6 +23,7 @@ import emu.grasscutter.game.world.GroupReplacementData;
import emu.grasscutter.game.world.SpawnDataEntry; import emu.grasscutter.game.world.SpawnDataEntry;
import emu.grasscutter.game.world.SpawnDataEntry.GridBlockId; import emu.grasscutter.game.world.SpawnDataEntry.GridBlockId;
import emu.grasscutter.game.world.SpawnDataEntry.SpawnGroupEntry; import emu.grasscutter.game.world.SpawnDataEntry.SpawnGroupEntry;
import emu.grasscutter.scripts.EntityControllerScriptManager;
import emu.grasscutter.scripts.SceneIndexManager; import emu.grasscutter.scripts.SceneIndexManager;
import emu.grasscutter.scripts.ScriptLoader; import emu.grasscutter.scripts.ScriptLoader;
import emu.grasscutter.utils.FileUtils; import emu.grasscutter.utils.FileUtils;
@@ -129,6 +130,8 @@ public final class ResourceLoader {
loadGroupReplacements(); loadGroupReplacements();
loadTrialAvatarCustomData(); loadTrialAvatarCustomData();
EntityControllerScriptManager.load();
Grasscutter.getLogger().info(translate("messages.status.resources.finish")); Grasscutter.getLogger().info(translate("messages.status.resources.finish"));
loadedAll = true; loadedAll = true;
} }
@@ -732,7 +735,7 @@ public final class ResourceLoader {
val gadgetMap = GameData.getGadgetMappingMap(); val gadgetMap = GameData.getGadgetMappingMap();
try { try {
JsonUtils.loadToList(getResourcePath("Server/GadgetMapping.json"), GadgetMapping.class) JsonUtils.loadToList(getResourcePath("Server/GadgetMapping.json"), GadgetMapping.class)
.forEach(entry -> gadgetMap.put(entry.getGadgetId(), entry));; .forEach(entry -> gadgetMap.put(entry.getGadgetId(), entry));
} catch (IOException | NullPointerException ignored) {} } catch (IOException | NullPointerException ignored) {}
Grasscutter.getLogger().debug("Loaded {} gadget mappings.", gadgetMap.size()); Grasscutter.getLogger().debug("Loaded {} gadget mappings.", gadgetMap.size());
} catch (Exception e) { } catch (Exception e) {