tribufu/rust-gamedig
1
0
Fork 0
mirror of https://github.com/tribufu/rust-gamedig synced 2026-05-18 09:35:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Protocol] Fix an instance of unwrapping in The Ship

Browse source
This commit is contained in:
CosminPerRam 2023-08-17 23:08:59 +03:00
parent 7e028ce97d
commit a8fc67412c
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/games/ts.rs
View file

@ -4,6 +4,7 @@ use crate::{
valve::{self, get_optional_extracted_data, Server, ServerPlayer, SteamApp},
GenericResponse,
},
GDErrorKind::PacketBad,
GDResult,
};
use std::net::{IpAddr, SocketAddr};
@ -90,12 +91,12 @@ impl CommonResponse for Response {
}
impl Response {
pub fn new_from_valve_response(response: valve::Response) -> Self {
pub fn new_from_valve_response(response: valve::Response) -> GDResult<Self> {
let (port, steam_id, tv_port, tv_name, keywords) = get_optional_extracted_data(response.info.extra_data);
let the_unwrapped_ship = response.info.the_ship.unwrap(); // TODO! Err here!
let the_unwrapped_ship = response.info.the_ship.ok_or(PacketBad)?;
Self {
Ok(Self {
protocol_version: response.info.protocol_version,
name: response.info.name,
map: response.info.map,
@ -122,7 +123,7 @@ impl Response {
mode: the_unwrapped_ship.mode,
witnesses: the_unwrapped_ship.witnesses,
duration: the_unwrapped_ship.duration,
}
})
}
}
@ -140,5 +141,5 @@ pub fn query_with_timeout(
timeout_settings,
)?;
Ok(Response::new_from_valve_response(valve_response))
Response::new_from_valve_response(valve_response)
}