aboutsummaryrefslogtreecommitdiff
path: root/azalea-world/src/entity
diff options
context:
space:
mode:
authorUbuntu <github@matdoes.dev>2022-11-15 20:38:32 +0000
committerUbuntu <github@matdoes.dev>2022-11-15 20:38:32 +0000
commit614c0df0537567c75f781df7affc091a4a466226 (patch)
treeffd4b23e4692cbdd6c966d389901fbe24d0ad76b /azalea-world/src/entity
parent9f78b3f4a7229033a3f5acaad6c8fffbe24e3e75 (diff)
downloadazalea-drasl-614c0df0537567c75f781df7affc091a4a466226.tar.xz
clippy
Diffstat (limited to 'azalea-world/src/entity')
-rw-r--r--azalea-world/src/entity/attributes.rs5
-rw-r--r--azalea-world/src/entity/mod.rs9
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)