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

2022-02-03 12:48:31 -05:00
parent 18c192d307 16b9d68773
commit de96c8201d
7 changed files with 89 additions and 81 deletions
--- a/core/src/mindustry/world/blocks/power/LightBlock.java
+++ b/core/src/mindustry/world/blocks/power/LightBlock.java
@@ -63,7 +63,7 @@ public class LightBlock extends Block{
        @Override
        public void control(LAccess type, double p1, double p2, double p3, double p4){
            if(type == LAccess.color){
-                color = Color.rgba8888((float)p1, (float)p2, (float)p3, 1f);
+                color = Color.rgba8888(Mathf.clamp((float)p1), Mathf.clamp((float)p2), Mathf.clamp((float)p3), 1f);
            }

            super.control(type, p1, p2, p3, p4);