From a4972886a3a2d94191cceaf503e13ff1974bf369 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 8 May 2023 09:50:33 -0400 Subject: [PATCH] Possible parser status effect fix --- core/src/mindustry/mod/ContentParser.java | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 6e8bdc1fb0..ef3511c674 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -781,13 +781,14 @@ public class ContentParser{ json = json.replace("#", "\\#"); } + currentMod = mod; + JsonValue value = parser.fromJson(null, Jval.read(json).toString(Jformat.plain)); if(!parsers.containsKey(type)){ throw new SerializationException("No parsers for content type '" + type + "'"); } - currentMod = mod; boolean located = locate(type, name) != null; Content c = parsers.get(type).parse(mod.name, name, value); c.minfo.sourceFile = file; diff --git a/gradle.properties b/gradle.properties index 955fe9e087..d593587c84 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=712ac8bf54 +archash=a06d7a24cc