Server: Fix issues with EnttObserver

Author: SirLynix

include/ServerLib/Systems/EnvironmentProxySystem.hpp

@@ -37,6 +37,8 @@ namespace tsom
 
 			void AddEnvironmentRecursively(ServerPlayer* player);
 
+			void Update(Nz::Time /*elapsedTime*/);
+
 			EnvironmentProxySystem& operator=(const EnvironmentProxySystem&) = delete;
 			EnvironmentProxySystem& operator=(EnvironmentProxySystem&&) = delete;
 

src/ServerLib/SessionVisibilityHandler.cpp

@@ -17,7 +17,7 @@ namespace tsom
 {
 	bool SessionVisibilityHandler::CreateChunk(entt::handle entity, Chunk& chunk)
 	{
-		assert(m_chunkNetworkMaps.contains(entity));
+		NazaraAssert(m_chunkNetworkMaps.contains(entity));
 		auto& chunkNetworkIndices = m_chunkNetworkMaps[entity];
 
 		ChunkIndices chunkIndices = chunk.GetIndices();
@@ -42,7 +42,7 @@ namespace tsom
 			m_freeChunkIds.Set(chunkIndex, false);
 			m_newlyVisibleChunk.UnboundedSet(chunkIndex);
 
-			assert(!chunkNetworkIndices.contains(chunkIndices));
+			NazaraAssert(!chunkNetworkIndices.contains(chunkIndices));
 			chunkNetworkIndices.emplace(chunkIndices, Nz::SafeCaster(chunkIndex));
 
 			if (chunkIndex >= m_visibleChunks.size())
@@ -59,13 +59,13 @@ namespace tsom
 
 	void SessionVisibilityHandler::CreateEntity(entt::handle entity, CreateEntityData entityData)
 	{
-		assert(!m_entityIndices.contains(entity));
+		NazaraAssert(!m_entityIndices.contains(entity));
 
-		assert(!m_deletedEntities.contains(entity)); //< resurrecting entities shouldn't be possible
+		NazaraAssert(!m_deletedEntities.contains(entity)); //< resurrecting entities shouldn't be possible
 
 		if (entity.try_get<PlanetComponent>() || entity.try_get<ShipComponent>())
 		{
-			assert(!m_chunkNetworkMaps.contains(entity));
+			NazaraAssert(!m_chunkNetworkMaps.contains(entity));
 			m_chunkNetworkMaps.emplace(entity, ChunkNetworkMap{});
 		}
 

src/ServerLib/Systems/EnvironmentProxySystem.cpp

@@ -15,22 +15,6 @@ namespace tsom
 	m_observer(registry),
 	m_registry(registry)
 	{
-		m_observer.OnEntityAdded.Connect([&](entt::entity entity)
-		{
-			ServerEnvironment* environment = ServerEnvironment::GetEnvironment(m_registry);
-
-			auto& envProxy = m_registry.get<EnvironmentProxyComponent>(entity);
-			environment->ForEachPlayer([&](ServerPlayer& player)
-			{
-				if (player.IsInEnvironment(envProxy.targetEnvironment))
-					return;
-
-				player.AddToEnvironment(envProxy.targetEnvironment, entt::handle(m_registry, entity));
-
-				auto& envProxySystem = envProxy.targetEnvironment->GetWorld().GetSystem<EnvironmentProxySystem>();
-				envProxySystem.AddEnvironmentRecursively(&player);
-			});
-		});
 	}
 
 	void EnvironmentProxySystem::AddEnvironmentRecursively(ServerPlayer* player)
@@ -50,4 +34,25 @@ namespace tsom
 			envProxySystem.AddEnvironmentRecursively(player);
 		}
 	}
+
+	void EnvironmentProxySystem::Update(Nz::Time /*elapsedTime*/)
+	{
+		for (entt::entity entity : m_observer)
+		{
+			ServerEnvironment* environment = ServerEnvironment::GetEnvironment(m_registry);
+
+			auto& envProxy = m_registry.get<EnvironmentProxyComponent>(entity);
+			environment->ForEachPlayer([&](ServerPlayer& player)
+			{
+				if (player.IsInEnvironment(envProxy.targetEnvironment))
+					return;
+
+				player.AddToEnvironment(envProxy.targetEnvironment, entt::handle(m_registry, entity));
+
+				auto& envProxySystem = envProxy.targetEnvironment->GetWorld().GetSystem<EnvironmentProxySystem>();
+				envProxySystem.AddEnvironmentRecursively(&player);
+			});
+		}
+		m_observer.Clear();
+	}
 }

src/ServerLib/Systems/NetworkedEntitiesSystem.cpp

@@ -148,7 +148,7 @@ namespace tsom
 
 			auto& entityNetwork = m_registry.get<NetworkedComponent>(entity);
 			if (!entityNetwork.ShouldSignalCreation())
-				return;
+				continue;
 
 			SessionVisibilityHandler::CreateEntityData createData = BuildCreateEntityData(entity);
 			ForEachVisibility([&](SessionVisibilityHandler& visibility)