Merge branch 'master' into do-you-hear-the-voices-too

2024-07-07 11:31:09 -04:00
parent 36f07c2590 41aea39a80
commit 0021f98335
52 changed files with 122 additions and 33 deletions
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1498,6 +1498,7 @@ public class LExecutor{
                }
                case ambientLight -> state.rules.ambientLight.fromDouble(value.num());
                case solarMultiplier -> state.rules.solarMultiplier = Math.max(value.numf(), 0f);
+                case dragMultiplier -> state.rules.dragMultiplier = Math.max(value.numf(), 0f);
                case ban -> {
                    Object cont = value.obj();
                    if(cont instanceof Block b){