Change valve get_server_rules to not return an Option

This commit is contained in:
CosminPerRam 2022-12-31 14:35:36 +02:00
parent a37e2506b4
commit ef8ac92506

View file

@ -383,8 +383,8 @@ impl ValveProtocol {
Ok(players) Ok(players)
} }
/// Get the server rules's. /// Get the server's rules.
fn get_server_rules(&mut self, app: &App, protocol: u8) -> GDResult<Option<Vec<ServerRule>>> { fn get_server_rules(&mut self, app: &App, protocol: u8) -> GDResult<Vec<ServerRule>> {
let mut buffer = self.get_request_data(&app, protocol, Request::RULES)?; let mut buffer = self.get_request_data(&app, protocol, Request::RULES)?;
let count = buffer.get_u16()? as usize; let count = buffer.get_u16()? as usize;
@ -397,7 +397,7 @@ impl ValveProtocol {
}) })
} }
Ok(Some(rules)) Ok(rules)
} }
} }
@ -430,7 +430,7 @@ fn get_response(address: &str, port: u16, app: App, gather_settings: GatheringSe
}, },
rules: match gather_settings.rules { rules: match gather_settings.rules {
false => None, false => None,
true => client.get_server_rules(&app, protocol)? true => Some(client.get_server_rules(&app, protocol)?)
} }
}) })
} }