Server/EnvironmentSwitch: Fix when switching planet while in a ship

DigitalPulseSoftware · Dec 9, 2024 · e034b4c · e034b4c
1 parent 63e5aae
commit e034b4c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/ServerLib/Components/ServerEnvironmentSwitchComponent.cpp b/src/ServerLib/Components/ServerEnvironmentSwitchComponent.cpp
@@ -8,13 +8,17 @@
 #include <ServerLib/ServerEnvironment.hpp>
 #include <ServerLib/Components/NetworkedComponent.hpp>
 #include <ServerLib/Systems/NetworkedEntitiesSystem.hpp>
+#include <Nazara/Core/Components/DisabledComponent.hpp>
 #include <Nazara/Core/Components/NodeComponent.hpp>
 #include <entt/entt.hpp>
 
 namespace tsom
 {
 	void ServerEnvironmentSwitchComponent::Switch(entt::handle oldEntity, ServerEnvironment* previousEnvironment, ServerEnvironment* newEnvironment, const EnvironmentTransform& relativeTransform)
 	{
+		// Disable old entity to not take it into account in the callbacks (for example when changing root environment)
+		oldEntity.emplace<Nz::DisabledComponent>();
+
 		auto& previousNode = oldEntity.get<Nz::NodeComponent>();
 		auto& previousClassInstance = oldEntity.get<ClassInstanceComponent>();