Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zesterer-master-patch-65668' into 'master'

Browse Source 
Fixed crash caused by invalid health, stated current <= maximum invariant more clearly

See merge request veloren/veloren!2871
This commit is contained in:
Joshua Barretto 2021-09-23 12:18:36 +00:00
commit bb0b5defec
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/comp/health.rs
View File

@ -31,7 +31,8 @@ pub struct Health {
// still having the advantages of being an integer. The scaling of 256 was chosen so that max
// health could be u16::MAX - 1, and then the scaled health could fit inside an f32 with no
// precision loss
/// Current health is how much health the entity currently has
/// Current health is how much health the entity currently has. Current
/// health *must* be lower than or equal to maximum health.
current: u32,
/// Base max is the amount of health the entity has without considering
/// temporary modifiers such as buffs
@ -81,6 +82,8 @@ impl Health {
// NaN does not need to be handled here as rust will automatically change to 0 when casting to u32
.clamp(0.0, Self::MAX_SCALED_HEALTH as f32) as u32;
self.maximum = maximum;
// Clamp the current health to enforce the current <= maximum invariant.
self.current = self.current.min(maximum);
}
#[cfg(not(target_arch = "wasm32"))]