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

Disable ticking completely when disconnected from a server

This commit is contained in:
Thinkofname 2016-04-09 11:43:44 +01:00
parent a644f3ac8f
commit bb82798ab8
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/screen/settings_menu.rs
View File

@ -107,7 +107,7 @@ impl super::Screen for SettingsMenu {
if self.show_disconnect_button { if self.show_disconnect_button {
let (mut btn_exit_game, mut txt_exit_game) = new_centered_button("Disconnect", renderer, ui_container, 100.0, ui::VAttach::Bottom); let (mut btn_exit_game, mut txt_exit_game) = new_centered_button("Disconnect", renderer, ui_container, 100.0, ui::VAttach::Bottom);
super::button_action(ui_container, btn_exit_game.clone(), Some(txt_exit_game.clone()), move | game, _ | { super::button_action(ui_container, btn_exit_game.clone(), Some(txt_exit_game.clone()), move | game, _ | {
game.server.disconnect(); game.server.disconnect(None);
game.screen_sys.replace_screen(Box::new(super::ServerList::new(None))); game.screen_sys.replace_screen(Box::new(super::ServerList::new(None)));
}); });
elements.add(btn_exit_game); elements.add(btn_exit_game);
@ -261,7 +261,7 @@ impl super::Screen for AudioSettingsMenu {
}); });
elements.add(btn_done); elements.add(btn_done);
elements.add(txt_done); elements.add(txt_done);
self.elements = Some(UIElement { self.elements = Some(UIElement {
elements: elements elements: elements
}); });

28
src/server/mod.rs
View File

@ -45,6 +45,7 @@ pub struct Server {
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>>>,
pub disconnect_reason: Option<format::Component>, pub disconnect_reason: Option<format::Component>,
just_disconnected: bool,
pub world: world::World, pub world: world::World,
pub entities: ecs::Manager, pub entities: ecs::Manager,
@ -274,6 +275,7 @@ impl Server {
conn: conn, conn: conn,
read_queue: read_queue, read_queue: read_queue,
disconnect_reason: None, disconnect_reason: None,
just_disconnected: false,
world: world::World::new(), world: world::World::new(),
world_age: 0, world_age: 0,
@ -308,12 +310,13 @@ impl Server {
} }
} }
pub fn disconnect(&mut self) { pub fn disconnect(&mut self, reason: Option<format::Component>) {
self.conn = None; self.conn = None;
self.disconnect_reason = None; self.disconnect_reason = reason;
if let Some(player) = self.player.take() { if let Some(player) = self.player.take() {
self.entities.remove_entity(player); self.entities.remove_entity(player);
} }
self.just_disconnected = true;
} }
pub fn is_connected(&self) -> bool { pub fn is_connected(&self) -> bool {
@ -404,13 +407,16 @@ impl Server {
} }
} }
self.entity_tick_timer += delta; if self.is_connected() || self.just_disconnected { // Allow an extra tick when disconnected to clean up
while self.entity_tick_timer >= 3.0 && self.is_connected() { self.just_disconnected = false;
self.entities.tick(&mut self.world, renderer); self.entity_tick_timer += delta;
self.entity_tick_timer -= 3.0; while self.entity_tick_timer >= 3.0 {
} self.entities.tick(&mut self.world, renderer);
self.entity_tick_timer -= 3.0;
}
self.entities.render_tick(&mut self.world, renderer); self.entities.render_tick(&mut self.world, renderer);
}
} }
pub fn remove(&mut self, renderer: &mut render::Renderer) { pub fn remove(&mut self, renderer: &mut render::Renderer) {
@ -543,11 +549,7 @@ impl Server {
} }
fn on_disconnect(&mut self, disconnect: packet::play::clientbound::Disconnect) { fn on_disconnect(&mut self, disconnect: packet::play::clientbound::Disconnect) {
self.conn = None; self.disconnect(Some(disconnect.reason));
self.disconnect_reason = Some(disconnect.reason);
if let Some(player) = self.player.take() {
self.entities.remove_entity(player);
}
} }
fn on_time_update(&mut self, time_update: packet::play::clientbound::TimeUpdate) { fn on_time_update(&mut self, time_update: packet::play::clientbound::TimeUpdate) {