Server/Environments: Improve switching of AtmosphereExchanger

Author: SirLynix

src/ServerLib/Components/ServerEnvironmentSwitchComponent.cpp

@@ -8,6 +8,7 @@
 #include <CommonLib/Components/ScriptedEntityComponent.hpp>
 #include <CommonLib/Components/TickComponent.hpp>
 #include <ServerLib/ServerEnvironment.hpp>
+#include <ServerLib/Components/AtmosphereExchanger.hpp>
 #include <ServerLib/Components/AtmosphereMonitor.hpp>
 #include <ServerLib/Components/DatabaseComponent.hpp>
 #include <ServerLib/Components/NetworkedComponent.hpp>
@@ -71,6 +72,9 @@ namespace tsom
 			newEntity.emplace<Nz::RigidBody3DComponent>(physicsSettings, rigidBodyComponent->GetReplicationMode());
 		}
 
+		if (AtmosphereExchanger* atmosphereExchanger = oldEntity.try_get<AtmosphereExchanger>())
+			newEntity.emplace<AtmosphereExchanger>(*atmosphereExchanger);
+
 		if (AtmosphereMonitor* atmosphereMonitor = oldEntity.try_get<AtmosphereMonitor>())
 			newEntity.emplace<AtmosphereMonitor>(*atmosphereMonitor);
 

src/ServerLib/Entities/ServerEntityClassLibrary.cpp

@@ -35,9 +35,7 @@ namespace tsom
 		Nz::UInt32 oxygenIndex = m_playerClass->FindProperty("oxygen");
 		Nz::UInt32 deathRpc = m_playerClass->FindClientRpc("death");
 
-		auto& atmosphereExchanger = entity.emplace<AtmosphereExchanger>();
-		atmosphereExchanger.gasModifier[GasType::Oxygen] = -Constants::PlayerOxygenConsumption;
-		atmosphereExchanger.gasModifier[GasType::CarbonDioxyde] = Constants::PlayerOxygenConsumption;
+		auto& atmosphereExchanger = entity.get<AtmosphereExchanger>();
 
 		atmosphereExchanger.OnExchangeFailed.Connect([healthIndex, oxygenIndex, deathRpc](entt::handle playerEntity, AtmosphereExchanger*)
 		{
@@ -95,6 +93,10 @@ namespace tsom
 
 		entity.emplace<AtmosphereMonitor>();
 
+		auto& atmosphereExchanger = entity.emplace<AtmosphereExchanger>();
+		atmosphereExchanger.gasModifier[GasType::Oxygen] = -Constants::PlayerOxygenConsumption;
+		atmosphereExchanger.gasModifier[GasType::CarbonDioxyde] = Constants::PlayerOxygenConsumption;
+
 		auto& characterComponent = entity.emplace<Nz::PhysCharacter3DComponent>(std::move(characterSettings));
 		characterComponent.SetImpl(characterController);
 		characterComponent.DisableSleeping();