Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

Browse Source 
# 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:
Anuken
2020-03-19 20:07:45 -04:00
parent 6cbc42d9de 966321baca
commit d2a2311cce
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/core/ContentLoader.java
View File

@@ -114,6 +114,7 @@ public class ContentLoader{
callable.get(content); callable.get(content);
}catch(Throwable e){ }catch(Throwable e){
if(content.minfo.mod != null){ if(content.minfo.mod != null){
Log.err(e);
mods.handleContentError(content, e); mods.handleContentError(content, e);
}else{ }else{
throw new RuntimeException(e); throw new RuntimeException(e);

2
core/src/mindustry/mod/ContentParser.java
View File

@@ -463,6 +463,8 @@ public class ContentParser{
if(t.getMessage() != null && t instanceof JsonParseException){ if(t.getMessage() != null && t instanceof JsonParseException){
builder.append("[accent][[JsonParse][] ").append(":\n").append(t.getMessage()); builder.append("[accent][[JsonParse][] ").append(":\n").append(t.getMessage());
}else if(t instanceof NullPointerException){
builder.append(Strings.parseException(t, true));
}else{ }else{
Array<Throwable> causes = Strings.getCauses(t); Array<Throwable> causes = Strings.getCauses(t);
for(Throwable e : causes){ for(Throwable e : causes){

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=31a5158c6395b7e905ba546348c98fd99ea736bb archash=f0eda1168b1230b6ce6c7ecee6b51eaf2048d856