From 6079980a507da5cafb2f5c2cdd2c43aa78915d14 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 15 Mar 2020 09:08:27 -0400 Subject: [PATCH] Fixed content loading crash --- core/src/mindustry/core/ContentLoader.java | 4 ++++ gradle.properties | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java index dc1e21e917..fe81b7ce59 100644 --- a/core/src/mindustry/core/ContentLoader.java +++ b/core/src/mindustry/core/ContentLoader.java @@ -1,5 +1,6 @@ package mindustry.core; +import arc.files.*; import arc.struct.*; import arc.func.*; import arc.graphics.*; @@ -182,6 +183,9 @@ public class ContentLoader{ } if(currentMod != null){ content.minfo.mod = currentMod; + if(content.minfo.sourceFile == null){ + content.minfo.sourceFile = new Fi(content.name); + } } contentNameMap[content.getContentType().ordinal()].put(content.name, content); } diff --git a/gradle.properties b/gradle.properties index 1bbf7facaa..3b4da6f663 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=3c2fae9b66b6affc1ba6701cce19ca9625c5e1b1 +archash=31a5158c6395b7e905ba546348c98fd99ea736bb