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

Fixed content loading crash

Browse Source
This commit is contained in:
Anuken
2020-03-15 09:08:27 -04:00
parent 8550995c4e
commit 6079980a50
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package mindustry.core; package mindustry.core;
import arc.files.*;
import arc.struct.*; import arc.struct.*;
import arc.func.*; import arc.func.*;
import arc.graphics.*; import arc.graphics.*;
@@ -182,6 +183,9 @@ public class ContentLoader{
} }
if(currentMod != null){ if(currentMod != null){
content.minfo.mod = currentMod; content.minfo.mod = currentMod;
if(content.minfo.sourceFile == null){
content.minfo.sourceFile = new Fi(content.name);
}
} }
contentNameMap[content.getContentType().ordinal()].put(content.name, content); contentNameMap[content.getContentType().ordinal()].put(content.name, content);
} }

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=3c2fae9b66b6affc1ba6701cce19ca9625c5e1b1 archash=31a5158c6395b7e905ba546348c98fd99ea736bb