Merge branch 'crabman/roll-panic-fix' into 'master'

Fix panic when interrupting rolls just before ending on slower clients See merge request veloren/veloren!4392
2025-07-26 05:12:29 +00:00 · 2024-03-23 00:21:35 +00:00
parent 3c846d4d17 0296ee1a2c
commit 3d3bc74d75
1 changed files with 2 additions and 1 deletions
--- a/common/src/comp/ability.rs
+++ b/common/src/comp/ability.rs
@ -1238,7 +1238,8 @@ impl CharacterAbility {
            }
        } else {
            0.0
-        };
+        }
+        .max(0.0);
        CharacterAbility::Roll {
            energy_cost: 10.85,
            // Remaining recover flows into buildup