Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possess bug, remove commented code, drain controller events

Browse Source
This commit is contained in:
Imbris
2019-10-20 20:59:53 -04:00
committed by Imbris
parent 966b2bfbff
commit a200dafd45
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/comp/controller.rs
View File

@ -30,6 +30,7 @@ pub struct ControllerInputs {
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
pub struct Controller { pub struct Controller {
pub inputs: ControllerInputs, pub inputs: ControllerInputs,
// TODO: consider SmallVec
pub events: Vec<ControlEvent>, pub events: Vec<ControlEvent>,
} }

2
common/src/sys/controller.rs
View File

@ -366,7 +366,7 @@ impl<'a> System<'a> for Sys {
} }
// Process controller events // Process controller events
for event in std::mem::replace(&mut controller.events, Vec::new()) { for event in controller.events.drain(..) {
match event { match event {
ControlEvent::Mount(mountee_uid) => { ControlEvent::Mount(mountee_uid) => {
if let Some(mountee_entity) = if let Some(mountee_entity) =

2
server/src/lib.rs
View File

@ -629,7 +629,7 @@ impl Server {
// Move player component // Move player component
{ {
let mut players = ecs.write_storage::<comp::Player>(); let mut players = ecs.write_storage::<comp::Player>();
if let Some(player) = players.get(possessor).cloned() { if let Some(player) = players.remove(possessor) {
let _ = players.insert(possesse, player); let _ = players.insert(possesse, player);
} }
} }

1
server/src/sys/mod.rs
View File

@ -19,7 +19,6 @@ const SUBSCRIPTION_SYS: &str = "server_subscription_sys";
const TERRAIN_SYNC_SYS: &str = "server_terrain_sync_sys"; const TERRAIN_SYNC_SYS: &str = "server_terrain_sync_sys";
const TERRAIN_SYS: &str = "server_terrain_sys"; const TERRAIN_SYS: &str = "server_terrain_sys";
const MESSAGE_SYS: &str = "server_message_sys"; const MESSAGE_SYS: &str = "server_message_sys";
//const SYNC_CHUNK_SYS: &str = "server_sync_chunk_sys";
pub fn add_server_systems(dispatch_builder: &mut DispatcherBuilder) { pub fn add_server_systems(dispatch_builder: &mut DispatcherBuilder) {
dispatch_builder.add(subscription::Sys, SUBSCRIPTION_SYS, &[]); dispatch_builder.add(subscription::Sys, SUBSCRIPTION_SYS, &[]);

4
voxygen/src/menu/main/start_singleplayer.rs
View File

@ -4,7 +4,7 @@ use crate::{
PlayState, PlayStateResult, PlayState, PlayStateResult,
}; };
use common::comp; use common::comp;
use log::warn; use log::{info, warn};
use server::settings::ServerSettings; use server::settings::ServerSettings;
pub struct StartSingleplayerState { pub struct StartSingleplayerState {
@ -59,7 +59,7 @@ impl PlayState for StartSingleplayerState {
}; };
// Print the metrics port // Print the metrics port
println!( info!(
"Metrics port: {}", "Metrics port: {}",
self.server_settings.metrics_address.port() self.server_settings.metrics_address.port()
); );