From 68aba856ec7f8e0c11e6ee7e57833ea346a28a01 Mon Sep 17 00:00:00 2001 From: juliancoffee Date: Mon, 27 Sep 2021 23:21:57 +0300 Subject: [PATCH] Cleaning --- common/src/comp/inventory/item/mod.rs | 7 ------- server/src/events/entity_manipulation.rs | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 547fd2a8a0..a432977fcd 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -862,13 +862,6 @@ impl Component for Item { type Storage = DerefFlaggedStorage>; } -// #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] -// pub struct ItemDrop>(pub LootSpec); - -// impl> Component for ItemDrop { -// type Storage = IdvStorage; -// } - #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] pub struct ItemDrop(pub Item); diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 111facb639..75469bd038 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -346,18 +346,18 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, last_change: Healt Some(comp::Alignment::Owned(_)) ) { - // Only drop loot if entity has agency (not a player), and if it is not owned by - // another entity (not a pet) + // Only drop loot if entity has agency (not a player), + // and if it is not owned by another entity (not a pet) // Decide for a loot drop before turning into a lootbag let old_body = state.ecs().write_storage::().remove(entity); - let loot_spec = { + let item = { let mut item_drop = state.ecs().write_storage::(); item_drop.remove(entity).map(|comp::ItemDrop(item)| item) }; - if let Some(item) = loot_spec { + if let Some(item) = item { let pos = state.ecs().read_storage::().get(entity).cloned(); let vel = state.ecs().read_storage::().get(entity).cloned(); if let Some(pos) = pos {