From 381bb5eef082c3c36dfc514b2e7be6b6d327aa7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Thu, 11 Mar 2021 10:25:59 +0100
Subject: [PATCH] fix tracy

---
 server-cli/src/main.rs           | 2 +-
 server/src/events/group_manip.rs | 3 ++-
 server/src/lib.rs                | 4 +++-
 server/src/login_provider.rs     | 1 +
 server/src/sys/msg/register.rs   | 8 +++++++-
 voxygen/src/run.rs               | 2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/server-cli/src/main.rs b/server-cli/src/main.rs
index 9d8879d02c..fbd390fc36 100644
--- a/server-cli/src/main.rs
+++ b/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(())
diff --git a/server/src/events/group_manip.rs b/server/src/events/group_manip.rs
index 94375867ac..e0d194dc2f 100644
--- a/server/src/events/group_manip.rs
+++ b/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,
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 6dbe1fe629..aeef6c9bbc 100644
--- a/server/src/lib.rs
+++ b/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::{
diff --git a/server/src/login_provider.rs b/server/src/login_provider.rs
index 4afc4a3385..8c929518af 100644
--- a/server/src/login_provider.rs
+++ b/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;
diff --git a/server/src/sys/msg/register.rs b/server/src/sys/msg/register.rs
index f239086b75..89e4afe9b4 100644
--- a/server/src/sys/msg/register.rs
+++ b/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>,
diff --git a/voxygen/src/run.rs b/voxygen/src/run.rs
index 9a3819ee17..f7647fd5c6 100644
--- a/voxygen/src/run.rs
+++ b/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());