Merge branch 'master' into crater

2020-01-01 20:13:21 +01:00
parent 197118e16e af9be8584e
commit 00933f0e30
2 changed files with 6 additions and 7 deletions
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -333,8 +333,8 @@ public class ContentParser{
    }

    private void readBundle(ContentType type, String name, JsonValue value){
-        UnlockableContent cont = Vars.content.getByName(type, name) instanceof UnlockableContent ?
-                                Vars.content.getByName(type, name) : null;
+        UnlockableContent cont = locate(type, name) instanceof UnlockableContent ?
+            locate(type, name) : null;

        String entryName = cont == null ? type + "." + currentMod.name + "-" + name + "." : type + "." + cont.name + ".";
        I18NBundle bundle = Core.bundle;