Merge; internal changes

2020-01-10 11:30:42 -05:00
parent c250b1d24a 5675565c96
commit f7791a2bb2
161 changed files with 7865 additions and 5181 deletions
--- a/core/src/mindustry/editor/EditorTool.java
+++ b/core/src/mindustry/editor/EditorTool.java
@@ -118,7 +118,7 @@ public enum EditorTool{
                if(editor.drawBlock.isOverlay()){
                    Block dest = tile.overlay();
                    if(dest == editor.drawBlock) return;
-                    tester = t -> t.overlay() == dest;
+                    tester = t -> t.overlay() == dest && !t.floor().isLiquid;
                    setter = t -> t.setOverlay(editor.drawBlock);
                }else if(editor.drawBlock.isFloor()){
                    Block dest = tile.floor();