mirrors/stevenarella
mirrors
/
stevenarella
mirror of https://github.com/iceiix/stevenarella.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Remove unused username field in Server. Closes https://github.com/iceiix/steven/issues/1

This commit is contained in:
ice_iix 2018-09-30 00:25:07 -07:00
parent 8ca41dfcda
commit 562ab9dbc4
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/mod.rs
View File

@ -37,7 +37,6 @@ pub mod plugin_messages;
pub mod target; pub mod target;
pub struct Server { pub struct Server {
username: String,
uuid: protocol::UUID, uuid: protocol::UUID,
conn: Option<protocol::Conn>, conn: Option<protocol::Conn>,
read_queue: Option<mpsc::Receiver<Result<packet::Packet, protocol::Error>>>, read_queue: Option<mpsc::Receiver<Result<packet::Packet, protocol::Error>>>,
@ -138,7 +137,7 @@ impl Server {
read.state = protocol::State::Play; read.state = protocol::State::Play;
write.state = protocol::State::Play; write.state = protocol::State::Play;
let rx = Self::spawn_reader(read); let rx = Self::spawn_reader(read);
return Ok(Server::new(val.username, protocol::UUID::from_str(&val.uuid), resources, Some(write), Some(rx))); return Ok(Server::new(protocol::UUID::from_str(&val.uuid), resources, Some(write), Some(rx)));
} }
protocol::packet::Packet::LoginDisconnect(val) => return Err(protocol::Error::Disconnect(val.reason)), protocol::packet::Packet::LoginDisconnect(val) => return Err(protocol::Error::Disconnect(val.reason)),
val => return Err(protocol::Error::Err(format!("Wrong packet: {:?}", val))), val => return Err(protocol::Error::Err(format!("Wrong packet: {:?}", val))),
@ -165,7 +164,6 @@ impl Server {
read.enable_encyption(&shared, true); read.enable_encyption(&shared, true);
write.enable_encyption(&shared, false); write.enable_encyption(&shared, false);
let username;
let uuid; let uuid;
loop { loop {
match try!(read.read_packet()) { match try!(read.read_packet()) {
@ -175,7 +173,6 @@ impl Server {
} }
protocol::packet::Packet::LoginSuccess(val) => { protocol::packet::Packet::LoginSuccess(val) => {
debug!("Login: {} {}", val.username, val.uuid); debug!("Login: {} {}", val.username, val.uuid);
username = val.username;
uuid = val.uuid; uuid = val.uuid;
read.state = protocol::State::Play; read.state = protocol::State::Play;
write.state = protocol::State::Play; write.state = protocol::State::Play;
@ -188,7 +185,7 @@ impl Server {
let rx = Self::spawn_reader(read); let rx = Self::spawn_reader(read);
Ok(Server::new(username, protocol::UUID::from_str(&uuid), resources, Some(write), Some(rx))) Ok(Server::new(protocol::UUID::from_str(&uuid), resources, Some(write), Some(rx)))
} }
fn spawn_reader(mut read: protocol::Conn) -> mpsc::Receiver<Result<packet::Packet, protocol::Error>> { fn spawn_reader(mut read: protocol::Conn) -> mpsc::Receiver<Result<packet::Packet, protocol::Error>> {
@ -209,7 +206,7 @@ impl Server {
} }
pub fn dummy_server(resources: Arc<RwLock<resources::Manager>>) -> Server { pub fn dummy_server(resources: Arc<RwLock<resources::Manager>>) -> Server {
let mut server = Server::new("dummy".to_owned(), protocol::UUID::default(), resources, None, None); let mut server = Server::new(protocol::UUID::default(), resources, None, None);
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
for x in -7*16 .. 7*16 { for x in -7*16 .. 7*16 {
for z in -7*16 .. 7*16 { for z in -7*16 .. 7*16 {
@ -245,7 +242,7 @@ impl Server {
} }
fn new( fn new(
username: String, uuid: protocol::UUID, uuid: protocol::UUID,
resources: Arc<RwLock<resources::Manager>>, resources: Arc<RwLock<resources::Manager>>,
conn: Option<protocol::Conn>, read_queue: Option<mpsc::Receiver<Result<packet::Packet, protocol::Error>>> conn: Option<protocol::Conn>, read_queue: Option<mpsc::Receiver<Result<packet::Packet, protocol::Error>>>
) -> Server { ) -> Server {
@ -258,7 +255,6 @@ impl Server {
let version = resources.read().unwrap().version(); let version = resources.read().unwrap().version();
Server { Server {
username: username,
uuid: uuid, uuid: uuid,
conn: conn, conn: conn,
read_queue: read_queue, read_queue: read_queue,