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 'UMR1352/fix#1065' into 'master'

Browse Source 
fix issue #1065: admin bag and other admin items inside a container doesn't disappear when dropped

Closes #1065

See merge request veloren/veloren!2114
This commit is contained in:
Samuel Keiffer 2021-04-13 05:55:36 +00:00
commit 879b3e0133
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,7 +613,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
},
}
// Drop items, Debug items should simply disappear when dropped
for (pos, ori, item) in dropped_items
for (pos, ori, mut item) in dropped_items
.into_iter()
.filter(|(_, _, i)| !matches!(i.quality(), item::Quality::Debug))
{
@ -622,6 +622,16 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
"common.items.utility.coins" => comp::object::Body::Coins,
_ => comp::object::Body::Pouch,
};
// If item is a container check inside of it for Debug items and remove them
item.slots_mut().iter_mut().for_each(|x| {
if let Some(contained_item) = &x {
if matches!(contained_item.quality(), item::Quality::Debug) {
std::mem::take(x);
}
}
});
state
.create_object(Default::default(), body)
.with(comp::Pos(pos.0 + *ori.look_dir() + Vec3::unit_z()))