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

Added range check to block pickup

Browse Source
This commit is contained in:
Brad
2020-10-30 17:29:58 -04:00
parent a556d2b5e7
commit a1baab1a5c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/events/inventory_manip.rs
View File

@ -110,6 +110,16 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
if let Some(block) = block { if let Some(block) = block {
if block.is_collectible() && state.can_set_block(pos) { if block.is_collectible() && state.can_set_block(pos) {
// Check if the block is within pickup range
if !within_pickup_range(
state.ecs().read_storage::<comp::Pos>().get(entity),
// We convert the Vec<i32> pos into a Vec<f32>, adding 0.5 to get the
// center of the block
Some(&Pos(pos.map(|e| e as f32 + 0.5))),
) {
return;
};
if let Some(item) = comp::Item::try_reclaim_from_block(block) { if let Some(item) = comp::Item::try_reclaim_from_block(block) {
let (event, item_was_added) = if let Some(inv) = state let (event, item_was_added) = if let Some(inv) = state
.ecs() .ecs()