From 98260308e8f312c3851197f72f5c263ac16da817 Mon Sep 17 00:00:00 2001 From: jake Date: Thu, 14 Oct 2021 00:30:53 -0600 Subject: [PATCH] stray spaces --- src/ship/items/manager.rs | 2 +- src/ship/packet/handler/trade.rs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ship/items/manager.rs b/src/ship/items/manager.rs index e25f1bc..47154e9 100644 --- a/src/ship/items/manager.rs +++ b/src/ship/items/manager.rs @@ -539,7 +539,7 @@ impl ItemManager { let inventory = self.character_inventory.get_mut(&character.id).ok_or(ItemManagerError::NoCharacter(character.id))?; let used_item = inventory.get_item_handle_by_id(item_id).ok_or(ItemManagerError::NoSuchItemId(item_id))?; let consumed_item = used_item.consume(amount)?; - + if let ItemDetail::TechniqueDisk(tech_disk) = consumed_item.item() { // TODO: validate tech level in packet is in bounds [1..30] character.techs.set_tech(tech_disk.tech, TechLevel(tech_disk.level as u8)); diff --git a/src/ship/packet/handler/trade.rs b/src/ship/packet/handler/trade.rs index 1718f63..618dfa0 100644 --- a/src/ship/packet/handler/trade.rs +++ b/src/ship/packet/handler/trade.rs @@ -47,8 +47,7 @@ where }) .next() .ok_or(TradeError::CouldNotFindTradePartner)?; - - + let item_blobs = items_to_trade.items.iter().take(items_to_trade.count as usize); let trade_items = item_blobs .map(|item| { @@ -117,7 +116,7 @@ where .map(|trade_partner| { (trade_partner.client, SendShipPacket::CancelTrade(CancelTrade {})) }); - + log::warn!("error in trading: {:?}", err); Ok(Box::new(vec![(id, SendShipPacket::CancelTrade(CancelTrade {}))] .into_iter()