mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-07-04 23:38:10 +07:00
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts: # core/src/mindustry/core/ContentLoader.java # core/src/mindustry/core/NetClient.java # core/src/mindustry/entities/type/Player.java # core/src/mindustry/io/MapIO.java # core/src/mindustry/io/TypeIO.java # core/src/mindustry/ui/dialogs/HostDialog.java # core/src/mindustry/ui/dialogs/JoinDialog.java # core/src/mindustry/world/LegacyColorMapper.java
This commit is contained in:
@ -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);
|
||||
|
@ -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<Throwable> causes = Strings.getCauses(t);
|
||||
for(Throwable e : causes){
|
||||
|
@ -1,3 +1,3 @@
|
||||
org.gradle.daemon=true
|
||||
org.gradle.jvmargs=-Xms256m -Xmx1024m
|
||||
archash=31a5158c6395b7e905ba546348c98fd99ea736bb
|
||||
archash=f0eda1168b1230b6ce6c7ecee6b51eaf2048d856
|
||||
|
Reference in New Issue
Block a user