fix tracy

server-cli/src/main.rs

@@ -210,7 +210,7 @@ fn main() -> io::Result<()> {
         // Wait for the next tick.
         clock.tick();
         #[cfg(feature = "tracy")]
-        common_base::finish_continuous_frame!();
+        common_base::tracy_client::finish_continuous_frame!();
     }
 
     Ok(())

server/src/events/group_manip.rs

@@ -1,4 +1,4 @@
-use crate::{client::Client, Server, State};
+use crate::{client::Client, Server};
 use common::{
     comp::{
         self,
@@ -9,6 +9,7 @@ use common::{
     uid::Uid,
 };
 use common_net::{msg::ServerGeneral, sync::WorldSyncExt};
+use common_sys::state::State;
 use specs::{
     world::{Entity, WorldExt},
     ReadStorage, WriteStorage,

server/src/lib.rs

@@ -75,8 +75,10 @@ use common_net::{
     sync::WorldSyncExt,
 };
 #[cfg(feature = "plugins")]
+use common_sys::plugin::memory_manager::EcsWorld;
+#[cfg(feature = "plugins")]
 use common_sys::plugin::PluginMgr;
-use common_sys::{plugin::memory_manager::EcsWorld, state::State};
+use common_sys::state::State;
 use metrics::{EcsSystemMetrics, PhysicsMetrics, TickMetrics};
 use network::{Network, Pid, ProtocolAddr};
 use persistence::{

server/src/login_provider.rs

@@ -1,6 +1,7 @@
 use crate::settings::BanRecord;
 use authc::{AuthClient, AuthClientError, AuthToken, Uuid};
 use common_net::msg::RegisterError;
+#[cfg(feature = "plugins")]
 use common_sys::plugin::memory_manager::EcsWorld;
 #[cfg(feature = "plugins")]
 use common_sys::plugin::PluginMgr;

server/src/sys/msg/register.rs

@@ -18,11 +18,17 @@ use plugin_api::Health;
 use specs::{Entities, Join, Read, ReadExpect, ReadStorage, WriteExpect, WriteStorage};
 use tracing::trace;
 
+#[cfg(feature = "plugins")]
 use common_sys::plugin::memory_manager::EcsWorld;
 
 #[cfg(feature = "plugins")]
 use common_sys::plugin::PluginMgr;
 
+#[cfg(feature = "plugins")]
+type ReadPlugin<'a> = Read<'a, PluginMgr>;
+#[cfg(not(feature = "plugins"))]
+type ReadPlugin<'a> = Option<Read<'a, ()>>;
+
 /// This system will handle new messages from clients
 #[derive(Default)]
 pub struct Sys;
@@ -37,7 +43,7 @@ impl<'a> System<'a> for Sys {
         WriteStorage<'a, Player>,
         WriteStorage<'a, PendingLogin>,
         Read<'a, UidAllocator>,
-        Read<'a, PluginMgr>,
+        ReadPlugin<'a>,
         ReadStorage<'a, Stats>,
         WriteExpect<'a, LoginProvider>,
         WriteStorage<'a, Admin>,

voxygen/src/run.rs

@@ -183,7 +183,7 @@ fn handle_main_events_cleared(
         global_state.clock.tick();
         drop(guard);
         #[cfg(feature = "tracy")]
-        common::util::tracy_client::finish_continuous_frame!();
+        common_base::tracy_client::finish_continuous_frame!();
 
         // Maintain global state.
         global_state.maintain(global_state.clock.dt());