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

Fixed #6351

Browse Source
This commit is contained in:
Anuken
2021-11-20 10:58:07 -05:00
parent d23813f328
commit d1a5198efc
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/io/JsonIO.java
View File

@@ -228,7 +228,12 @@ public class JsonIO{
Item item = Vars.content.getByName(ContentType.item, str); Item item = Vars.content.getByName(ContentType.item, str);
Liquid liquid = Vars.content.getByName(ContentType.liquid, str); Liquid liquid = Vars.content.getByName(ContentType.liquid, str);
Block block = Vars.content.getByName(ContentType.block, str); Block block = Vars.content.getByName(ContentType.block, str);
return item != null ? item : liquid == null ? block : liquid; UnitType unit = Vars.content.getByName(ContentType.unit, str);
return
item != null ? item :
block != null ? block :
liquid != null ? liquid :
unit;
} }
}); });

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=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=430f9146f3c9c34db1f9ad9a8784e71c322246f2 archash=f106eee2