From b45a0ba1d5c86ae19eea070d34fda62d8f8fa135 Mon Sep 17 00:00:00 2001
From: jake <jake@sharnoth.com>
Date: Thu, 3 Dec 2020 15:03:58 -0700
Subject: [PATCH] clean up directmsg handler

---
 src/ship/ship.rs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/ship/ship.rs b/src/ship/ship.rs
index 9bd9706..b61fbf5 100644
--- a/src/ship/ship.rs
+++ b/src/ship/ship.rs
@@ -490,41 +490,34 @@ impl<EG: EntityGateway> ShipServerState<EG> {
 
     async fn direct_message(&mut self, id: ClientId, msg: &DirectMessage) -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, anyhow::Error> {
         let target = msg.flag;
+        let block = self.blocks.with_client(id, &self.clients)?;
         Ok(match &msg.msg {
             GameMessage::GuildcardSend(guildcard_send) => {
-                let block = self.blocks.with_client(id, &self.clients)?;
                 handler::direct_message::guildcard_send(id, guildcard_send, target, &block.client_location, &self.clients)
             },
             GameMessage::RequestItem(request_item) => {
-                let block = self.blocks.with_client(id, &self.clients)?;
                 handler::direct_message::request_item(id, request_item, &mut self.entity_gateway, &mut block.client_location, &mut self.clients, &mut block.rooms, &mut self.item_manager).await?
             },
             GameMessage::PickupItem(pickup_item) => {
-                let block = self.blocks.with_client(id, &self.clients)?;
                 handler::direct_message::pickup_item(id, pickup_item, &mut self.entity_gateway, &mut block.client_location, &mut self.clients, &mut self.item_manager).await?
             },
             GameMessage::BoxDropRequest(box_drop_request) => {
-                let block = self.blocks.with_client(id, &self.clients)?;
                 handler::direct_message::request_box_item(id, box_drop_request, &mut self.entity_gateway, &mut block.client_location, &mut self.clients, &mut block.rooms, &mut self.item_manager).await?
             },
             GameMessage::BankRequest(_bank_request) => {
                 handler::direct_message::send_bank_list(id, &self.clients, &mut self.item_manager).await?
             },
             GameMessage::BankInteraction(bank_interaction) => {
-                let block = self.blocks.with_client(id, &self.clients)?;
                 handler::direct_message::bank_interaction(id, bank_interaction, &mut self.entity_gateway, &block.client_location, &mut self.clients, &mut self.item_manager).await?
             },
             GameMessage::ShopRequest(shop_request) => {
-                let block = self.blocks.with_client(id, &self.clients)?;
                 handler::direct_message::shop_request(id, shop_request, &block.client_location, &mut self.clients, &block.rooms, &self.level_table, &mut self.shops).await?
             },
             GameMessage::BuyItem(buy_item) => {
-                let block = self.blocks.with_client(id, &self.clients)?;
                 handler::direct_message::buy_item(id, buy_item, &mut self.entity_gateway, &block.client_location, &mut self.clients, &mut self.item_manager).await?
             },
             _ => {
                 let cmsg = msg.clone();
-                let block = self.blocks.with_client(id, &self.clients)?;
                 Box::new(block.client_location.get_all_clients_by_client(id).unwrap().into_iter()
                     .filter(move |client| client.local_client.id() == target as u8)
                     .map(move |client| {