diff --git a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
index e4b24b15f4..0ce718aa57 100644
--- a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
@@ -70,7 +70,7 @@ public class EnergyFieldAbility extends Ability{
 
         for(int i = 0; i < sectors; i++){
             float rot = unit.rotation + i * 360f/sectors - Time.time * rotateSpeed;
-            Lines.swirl(rx, ry, orbRadius + 3f, sectorRad, rot);
+            Lines.arc(rx, ry, orbRadius + 3f, sectorRad, rot);
         }
 
         Lines.stroke(Lines.getStroke() * curStroke);
@@ -78,7 +78,7 @@ public class EnergyFieldAbility extends Ability{
         if(curStroke > 0){
             for(int i = 0; i < sectors; i++){
                 float rot = unit.rotation + i * 360f/sectors + Time.time * rotateSpeed;
-                Lines.swirl(rx, ry, range, sectorRad, rot);
+                Lines.arc(rx, ry, range, sectorRad, rot);
             }
         }
 
diff --git a/core/src/mindustry/world/blocks/power/LightBlock.java b/core/src/mindustry/world/blocks/power/LightBlock.java
index 36fc8c0f5f..e81eda7cb0 100644
--- 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);
diff --git a/gradle.properties b/gradle.properties
index c72da51d2f..c88cb0a231 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,4 @@ android.useAndroidX=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=0370ef92e5
+archash=680252597e