jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

roominfo #112

Merged
jake merged 61 commits from roominfo into master 2022-07-25 18:08:45 -04:00
Conversation 1 Commits 61 Files Changed 5 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eac0a31056 - Show all commits

5
src/ship/items/actions.rs
View File

@ -80,7 +80,7 @@ pub async fn pick_up_item<EG>(
where where
EG: EntityGateway, EG: EntityGateway,
{ {
let result: Result<TriggerCreateItem, ItemStateError> = entity_gateway.with_transaction(|transaction| async move { entity_gateway.with_transaction(|transaction| async move {
let item_state_proxy = ItemStateProxy::new(item_state); let item_state_proxy = ItemStateProxy::new(item_state);
let ((item_state_proxy, transaction), result) = ItemStateAction::default() let ((item_state_proxy, transaction), result) = ItemStateAction::default()
.act(take_item_from_floor(character.id, *item_id)) .act(take_item_from_floor(character.id, *item_id))
@ -89,8 +89,7 @@ where
.await?; .await?;
item_state_proxy.commit(); item_state_proxy.commit();
Ok((transaction, result)) Ok((transaction, result))
}).await; }).await
result
} }
pub async fn drop_item<EG>( pub async fn drop_item<EG>(