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

Conflicts: core/src/mindustry/mod/ClassMap.java
2021-07-04 09:52:57 -04:00
parent 0d280ea77f 178cb12f85
commit ebf0c71db6
34 changed files with 168 additions and 135 deletions
--- a/core/src/mindustry/graphics/BlockRenderer.java
+++ b/core/src/mindustry/graphics/BlockRenderer.java
@@ -339,7 +339,7 @@ public class BlockRenderer{
                        Draw.z(Layer.block);
                    }

-                    if(renderer.drawStatus && block.consumes.any()){
+                    if(entity.team == player.team() && renderer.drawStatus && block.consumes.any()){
                        entity.drawStatus();
                    }
                }