xtex/azalea
1
0
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2024-10-18 01:24:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix panic in update_modifiers_for_held_item

Browse source 
found from 27cecdb8bf
This commit is contained in:
mat 2024-07-22 01:00:38 +00:00
parent 7e93c2d766
commit 86fd3168f7
3 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
azalea-client/src/interact.rs
View file

@ -367,7 +367,6 @@ fn update_modifiers_for_held_item(
.attack_speed
.insert(azalea_entity::attributes::base_attack_speed_modifier(
added_attack_speed,
))
.unwrap();
));
}
}

2
azalea-client/src/movement.rs
View file

@ -458,7 +458,7 @@ fn set_sprinting(
if sprinting {
attributes
.speed
.insert(azalea_entity::attributes::sprinting_modifier())
.try_insert(azalea_entity::attributes::sprinting_modifier())
.is_ok()
} else {
attributes

27
azalea-entity/src/attributes.rs
View file

@ -1,6 +1,6 @@
//! See <https://minecraft.fandom.com/wiki/Attribute>.
use std::collections::HashMap;
use std::collections::{hash_map, HashMap};
use azalea_buf::McBuf;
use azalea_core::resource_location::ResourceLocation;
@ -46,16 +46,21 @@ impl AttributeInstance {
total
}
/// Add a new modifier to this attribute.
pub fn insert(&mut self, modifier: AttributeModifier) -> Result<(), AlreadyPresentError> {
if self
.modifiers_by_id
.insert(modifier.id.clone(), modifier)
.is_some()
{
Err(AlreadyPresentError)
} else {
Ok(())
/// Add a new modifier to this attribute and return the previous value, if
/// present.
pub fn insert(&mut self, modifier: AttributeModifier) -> Option<AttributeModifier> {
self.modifiers_by_id.insert(modifier.id.clone(), modifier)
}
/// Insert the given modifier if it's not already present, otherwise returns
/// [`AlreadyPresentError`].
pub fn try_insert(&mut self, modifier: AttributeModifier) -> Result<(), AlreadyPresentError> {
match self.modifiers_by_id.entry(modifier.id.clone()) {
hash_map::Entry::Occupied(_) => Err(AlreadyPresentError),
hash_map::Entry::Vacant(entry) => {
entry.insert(modifier);
Ok(())
}
}
}