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

Conflicts: gradle.properties
2021-11-10 14:36:45 -05:00
parent c87bc11ad2 bb443e359f
commit f3b2e4498d
19 changed files with 57 additions and 31 deletions
--- a/core/src/mindustry/graphics/LightRenderer.java
+++ b/core/src/mindustry/graphics/LightRenderer.java
@@ -182,6 +182,7 @@ public class LightRenderer{
    public void draw(){
        if(!Vars.enableLight){
            lights.clear();
+            circleIndex = 0;
            return;
        }