diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-07-20 23:48:33 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-07-20 23:48:33 +0800 |
| commit | ab4ae39664f5bbb5aa12d6be5b249bdd29e4c4e4 (patch) | |
| tree | 6afa85e5c2dcce1988402f08271d342511328ace /src/main/java/net/fabricmc/loom/configuration | |
| parent | 695863367fb42d6435a36aea9290cb9eb1638ced (diff) | |
| parent | f971bce5e2ac257e1b316810bebed744cdea0a17 (diff) | |
| download | architectury-loom-ab4ae39664f5bbb5aa12d6be5b249bdd29e4c4e4.tar.gz architectury-loom-ab4ae39664f5bbb5aa12d6be5b249bdd29e4c4e4.tar.bz2 architectury-loom-ab4ae39664f5bbb5aa12d6be5b249bdd29e4c4e4.zip | |
Merge remote-tracking branch 'architectury/dev/0.9' into dev/0.9
# Conflicts:
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java index 33aee980..a9335764 100644 --- a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java +++ b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java @@ -269,7 +269,7 @@ public class RunConfig { } private static String getMainClass(String side, LoomGradleExtension extension, String defaultMainClass) { - JsonObject installerJson = extension.getInstallerData().installerJson(); + JsonObject installerJson = extension.getInstallerData() == null ? null : extension.getInstallerData().installerJson(); if (installerJson != null && installerJson.has("mainClass")) { JsonElement mainClassJson = installerJson.get("mainClass"); |