Merge

2020-02-19 13:10:25 -05:00
parent 71f1fb5d66 e8ca5fe211
commit 1d1c73fd6f
15 changed files with 189 additions and 124 deletions
--- a/core/src/mindustry/entities/def/BuilderComp.java
+++ b/core/src/mindustry/entities/def/BuilderComp.java
@@ -76,6 +76,9 @@ abstract class BuilderComp implements Unitc, DrawLayerFlyingc{
                requests.removeFirst();
                return;
            }
+        }else if(tile.team() != team()){
+            requests.removeFirst();
+            return;
        }

        if(tile.entity instanceof BuildEntity && !current.initialized){