Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

2021-11-25 13:29:51 -05:00
parent 57e0f5ba3f 04b1ba31a9
commit f214f38f08
7 changed files with 41 additions and 35 deletions
--- a/core/src/mindustry/io/JsonIO.java
+++ b/core/src/mindustry/io/JsonIO.java
@@ -231,8 +231,8 @@ public class JsonIO{
                UnitType unit = Vars.content.getByName(ContentType.unit, str);
                return
                    item != null ? item :
-                    block != null ? block :
                    liquid != null ? liquid :
+                    block != null ? block :
                    unit;
            }
        });