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

Possible parser status effect fix

Browse Source
This commit is contained in:
Anuken
2023-05-08 09:50:33 -04:00
parent 72c67f6c9b
commit a4972886a3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -781,13 +781,14 @@ public class ContentParser{
json = json.replace("#", "\\#"); json = json.replace("#", "\\#");
} }
currentMod = mod;
JsonValue value = parser.fromJson(null, Jval.read(json).toString(Jformat.plain)); JsonValue value = parser.fromJson(null, Jval.read(json).toString(Jformat.plain));
if(!parsers.containsKey(type)){ if(!parsers.containsKey(type)){
throw new SerializationException("No parsers for content type '" + type + "'"); throw new SerializationException("No parsers for content type '" + type + "'");
} }
currentMod = mod;
boolean located = locate(type, name) != null; boolean located = locate(type, name) != null;
Content c = parsers.get(type).parse(mod.name, name, value); Content c = parsers.get(type).parse(mod.name, name, value);
c.minfo.sourceFile = file; c.minfo.sourceFile = file;

2
gradle.properties
View File

@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=712ac8bf54 archash=a06d7a24cc