diff --git a/src/main/java/emu/grasscutter/data/ResourceLoader.java b/src/main/java/emu/grasscutter/data/ResourceLoader.java index 32374e7fb..1332942aa 100644 --- a/src/main/java/emu/grasscutter/data/ResourceLoader.java +++ b/src/main/java/emu/grasscutter/data/ResourceLoader.java @@ -23,6 +23,7 @@ import emu.grasscutter.game.world.GroupReplacementData; import emu.grasscutter.game.world.SpawnDataEntry; import emu.grasscutter.game.world.SpawnDataEntry.GridBlockId; import emu.grasscutter.game.world.SpawnDataEntry.SpawnGroupEntry; +import emu.grasscutter.scripts.EntityControllerScriptManager; import emu.grasscutter.scripts.SceneIndexManager; import emu.grasscutter.scripts.ScriptLoader; import emu.grasscutter.utils.FileUtils; @@ -129,6 +130,8 @@ public final class ResourceLoader { loadGroupReplacements(); loadTrialAvatarCustomData(); + EntityControllerScriptManager.load(); + Grasscutter.getLogger().info(translate("messages.status.resources.finish")); loadedAll = true; } @@ -732,7 +735,7 @@ public final class ResourceLoader { val gadgetMap = GameData.getGadgetMappingMap(); try { 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) {} Grasscutter.getLogger().debug("Loaded {} gadget mappings.", gadgetMap.size()); } catch (Exception e) {