diff options
Diffstat (limited to 'azalea-world/src/entity')
| -rw-r--r-- | azalea-world/src/entity/attributes.rs | 5 | ||||
| -rw-r--r-- | azalea-world/src/entity/mod.rs | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/azalea-world/src/entity/attributes.rs b/azalea-world/src/entity/attributes.rs index 1050615c..f7e9682e 100644 --- a/azalea-world/src/entity/attributes.rs +++ b/azalea-world/src/entity/attributes.rs @@ -40,9 +40,8 @@ impl AttributeInstance { AttributeModifierOperation::MultiplyBase => total += self.base * modifier.amount, _ => {} } - match modifier.operation { - AttributeModifierOperation::MultiplyTotal => total *= 1.0 + modifier.amount, - _ => {} + if let AttributeModifierOperation::MultiplyTotal = modifier.operation { + total *= 1.0 + modifier.amount } } total diff --git a/azalea-world/src/entity/mod.rs b/azalea-world/src/entity/mod.rs index 63147ced..540bfeed 100644 --- a/azalea-world/src/entity/mod.rs +++ b/azalea-world/src/entity/mod.rs @@ -270,10 +270,19 @@ impl EntityData { &self.pos } + /// Convert this &mut self into a (mutable) pointer. + /// + /// # Safety + /// The entity MUST exist while this pointer exists. pub unsafe fn as_ptr(&mut self) -> NonNull<EntityData> { NonNull::new_unchecked(self as *mut EntityData) } + /// Convert this &self into a (mutable) pointer. + /// + /// # Safety + /// The entity MUST exist while this pointer exists. You also must not + /// modify the data inside the pointer. pub unsafe fn as_const_ptr(&self) -> NonNull<EntityData> { // this is cursed NonNull::new_unchecked(self as *const EntityData as *mut EntityData) |