From 156821cc6ef89576fbcb2842f65c5ab41c0d3ecb Mon Sep 17 00:00:00 2001
From: jake <jake@sharnoth.com>
Date: Tue, 14 Nov 2023 22:16:40 -0700
Subject: [PATCH] more libpso updates

---
 src/login_server/src/character.rs     | 10 +++++-----
 src/networking/src/mainloop/client.rs |  2 +-
 src/patch_server/src/lib.rs           |  2 +-
 src/ship_server/src/auth.rs           |  4 ++--
 src/ship_server/src/lobby.rs          |  2 +-
 tests/common.rs                       |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/login_server/src/character.rs b/src/login_server/src/character.rs
index c317be9..3bce346 100644
--- a/src/login_server/src/character.rs
+++ b/src/login_server/src/character.rs
@@ -177,7 +177,7 @@ impl ClientState {
             user: None,
             characters: None,
             guildcard_data_buffer: None,
-            session: Session::new(),
+            session: Session::default(),
         }
     }
 }
@@ -342,15 +342,15 @@ impl<EG: EntityGateway + Clone> CharacterServerState<EG> {
                 if let Some(connected_client) = self.connected_clients.read().await.get(&user.id) {
                     if let Some(expires) = connected_client.expires {
                         if expires > chrono::Utc::now() {
-                            return Ok(vec![SendCharacterPacket::LoginResponse(LoginResponse::by_status(AccountStatus::AlreadyOnline, Session::new()))]);
+                            return Ok(vec![SendCharacterPacket::LoginResponse(LoginResponse::by_status(AccountStatus::AlreadyOnline, Session::default()))]);
                         }
                     }
                     else {
-                        return Ok(vec![SendCharacterPacket::LoginResponse(LoginResponse::by_status(AccountStatus::AlreadyOnline, Session::new()))]);
+                        return Ok(vec![SendCharacterPacket::LoginResponse(LoginResponse::by_status(AccountStatus::AlreadyOnline, Session::default()))]);
                     }
                 }
 
-                let mut response = LoginResponse::by_status(AccountStatus::Ok, Session::new());
+                let mut response = LoginResponse::by_status(AccountStatus::Ok, Session::default());
                 response.guildcard = user.guildcard;
                 response.team_id = user.team_id.map_or(0, |ti| ti);
 
@@ -367,7 +367,7 @@ impl<EG: EntityGateway + Clone> CharacterServerState<EG> {
                 Ok(vec![SendCharacterPacket::LoginResponse(response)])
             },
             Err(err) => {
-                Ok(vec![SendCharacterPacket::LoginResponse(LoginResponse::by_status(err, Session::new()))])
+                Ok(vec![SendCharacterPacket::LoginResponse(LoginResponse::by_status(err, Session::default()))])
             }
         }
     }
diff --git a/src/networking/src/mainloop/client.rs b/src/networking/src/mainloop/client.rs
index 3bcb971..619a1a6 100644
--- a/src/networking/src/mainloop/client.rs
+++ b/src/networking/src/mainloop/client.rs
@@ -72,7 +72,7 @@ impl<C: PSOCipher> PacketReceiver<C> {
         let mut dec_buf = {
             //let mut cipher = self.cipher.lock().await;
             let block_chunk_len = self.recv_buffer.len() / self.cipher.block_size() * self.cipher.block_size();
-            let buf = self.recv_buffer.drain(..block_chunk_len).collect();
+            let buf = self.recv_buffer.drain(..block_chunk_len).collect::<Vec<_>>();
             self.cipher.decrypt(&buf)?
         };
         self.incoming_data.append(&mut dec_buf);
diff --git a/src/patch_server/src/lib.rs b/src/patch_server/src/lib.rs
index 565530d..ecf51f9 100644
--- a/src/patch_server/src/lib.rs
+++ b/src/patch_server/src/lib.rs
@@ -341,7 +341,7 @@ impl Iterator for SendFileIterator {
                 if len == 0 {
                     self.current_file = None;
                     self.chunk_num = 0;
-                    Some(SendPatchPacket::EndFileSend(EndFileSend::new()))
+                    Some(SendPatchPacket::EndFileSend(EndFileSend::default()))
                 }
                 else {
                     let mut crc = crc32::Digest::new(crc32::IEEE);
diff --git a/src/ship_server/src/auth.rs b/src/ship_server/src/auth.rs
index b8f746e..2c60f67 100644
--- a/src/ship_server/src/auth.rs
+++ b/src/ship_server/src/auth.rs
@@ -23,7 +23,7 @@ where
 {
     Ok(match get_login_status(entity_gateway, &pkt).await {
         Ok(user) => {
-            let mut response = LoginResponse::by_status(AccountStatus::Ok, Session::new());
+            let mut response = LoginResponse::by_status(AccountStatus::Ok, Session::default());
             response.guildcard = user.id.0;
             response.team_id = user.team_id.map_or(31, |ti| ti);
             let characters = entity_gateway.get_characters_by_user(&user).await?;
@@ -44,7 +44,7 @@ where
             vec![SendShipPacket::LoginResponse(response), SendShipPacket::ShipBlockList(ShipBlockList::new(ship_name, num_blocks))]
         },
         Err(err) => {
-            vec![SendShipPacket::LoginResponse(LoginResponse::by_status(err, Session::new()))]
+            vec![SendShipPacket::LoginResponse(LoginResponse::by_status(err, Session::default()))]
         }
     })
 }
diff --git a/src/ship_server/src/lobby.rs b/src/ship_server/src/lobby.rs
index 8e6090a..d29d8d4 100644
--- a/src/ship_server/src/lobby.rs
+++ b/src/ship_server/src/lobby.rs
@@ -48,7 +48,7 @@ pub async fn block_selected(id: ClientId,
                     character: fc,
                 }))),
                 (id, SendShipPacket::CharDataRequest(CharDataRequest {})),
-                (id, SendShipPacket::LobbyList(LobbyList::new())),
+                (id, SendShipPacket::LobbyList(LobbyList::default())),
             ])
         })}).await?
 }
diff --git a/tests/common.rs b/tests/common.rs
index 5a2e835..31f373e 100644
--- a/tests/common.rs
+++ b/tests/common.rs
@@ -112,7 +112,7 @@ pub async fn log_in_char<EG: EntityGateway + Clone>(ship: &mut ShipServerState<E
         password: utf8_to_array(&password),
         unknown3: [0; 40],
         hwinfo: [0; 8],
-        session: Session::new(),
+        session: Session::default(),
     })).await.unwrap();
 }