Remove inventory::swap and improve inventory::insert

This commit is contained in:
timokoesters
2019-08-31 00:09:25 +02:00
parent ba02956f05
commit a95893e43b
2 changed files with 14 additions and 16 deletions

View File

@ -724,11 +724,14 @@ impl Server {
if let Some(stats) =
state.ecs().write_storage::<comp::Stats>().get_mut(entity)
{
state
.ecs()
.write_storage::<comp::Inventory>()
.get_mut(entity)
.map(|inv| inv.insert(x, stats.equipment.main.take()));
// Insert old item into inventory
if let Some(old_item) = stats.equipment.main.take() {
state
.ecs()
.write_storage::<comp::Inventory>()
.get_mut(entity)
.map(|inv| inv.insert(x, old_item));
}
stats.equipment.main = item;
}