diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java index 75cf5bb3a9..007abc2a68 100644 --- a/core/src/mindustry/core/ContentLoader.java +++ b/core/src/mindustry/core/ContentLoader.java @@ -114,6 +114,7 @@ public class ContentLoader{ callable.get(content); }catch(Throwable e){ if(content.minfo.mod != null){ + Log.err(e); mods.handleContentError(content, e); }else{ throw new RuntimeException(e); diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 1118794a54..fd456df806 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -463,6 +463,8 @@ public class ContentParser{ if(t.getMessage() != null && t instanceof JsonParseException){ builder.append("[accent][[JsonParse][] ").append(":\n").append(t.getMessage()); + }else if(t instanceof NullPointerException){ + builder.append(Strings.parseException(t, true)); }else{ Array causes = Strings.getCauses(t); for(Throwable e : causes){ diff --git a/gradle.properties b/gradle.properties index 3b4da6f663..1d264aa135 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=31a5158c6395b7e905ba546348c98fd99ea736bb +archash=f0eda1168b1230b6ce6c7ecee6b51eaf2048d856