Merge branches 'asset-manager' and 'master' of https://github.com/Anuken/Mindustry

2019-08-27 19:40:13 -04:00
parent 9d214a77d7 1dfa0d08de
commit 43245681fe
4 changed files with 27 additions and 2 deletions
--- a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java
+++ b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java
@@ -33,7 +33,9 @@ public class MirrorFilter extends GenerateFilter{
            mirror(v3, v1.x, v1.y, v2.x, v2.y);
            Tile tile = in.tile(v3.x, v3.y);
            in.floor = tile.floor();
-            in.block = tile.block();
+            if(!tile.block().synthetic()){
+                in.block = tile.block();
+            }
            in.ore = tile.overlay();
        }
    }