Handle ship piloting server-side to handle player death

SirLynix · SirLynix · commit e99c43311edc · 2025-04-14T01:13:54.000+02:00
diff --git a/include/ClientLib/ClientSessionHandler.hpp b/include/ClientLib/ClientSessionHandler.hpp
@@ -68,6 +68,8 @@ namespace tsom
 			void HandlePacket(Packets::S_EnvironmentsUpdateOwner&& envOwnerUpdate);
 			void HandlePacket(Packets::S_GameData&& gameData);
 			void HandlePacket(Packets::S_NetworkStrings&& networkStrings);
+			void HandlePacket(Packets::S_PilotShip&& pilotShip);
+			void HandlePacket(Packets::S_PilotShipFinish&& pilotShipFinish);
 			void HandlePacket(Packets::S_PlayerJoin&& playerJoin);
 			void HandlePacket(Packets::S_PlayerLeave&& playerLeave);
 			void HandlePacket(Packets::S_PlayerNameUpdate&& playerNameUpdate);
diff --git a/include/CommonLib/Protocol/PacketList.hpp b/include/CommonLib/Protocol/PacketList.hpp
@@ -46,6 +46,8 @@ TSOM_NETWORK_PACKET(S_EnvironmentDestroy)
 TSOM_NETWORK_PACKET(S_EnvironmentsUpdateOwner)
 TSOM_NETWORK_PACKET(S_GameData)
 TSOM_NETWORK_PACKET(S_NetworkStrings)
+TSOM_NETWORK_PACKET(S_PilotShip)
+TSOM_NETWORK_PACKET(S_PilotShipFinish)
 TSOM_NETWORK_PACKET(S_PlayerJoin)
 TSOM_NETWORK_PACKET(S_PlayerLeave)
 TSOM_NETWORK_PACKET_LAST(S_PlayerNameUpdate)
diff --git a/include/CommonLib/Protocol/Packets.hpp b/include/CommonLib/Protocol/Packets.hpp
@@ -332,6 +332,15 @@ namespace tsom
 			std::vector<SecuredString<1024>> strings;
 		};
 
+		struct S_PilotShip
+		{
+			Helper::EntityId shipEntity;
+		};
+
+		struct S_PilotShipFinish
+		{
+		};
+
 		struct S_PlayerLeave
 		{
 			PlayerIndex index;
@@ -378,6 +387,8 @@ namespace tsom
 		TSOM_COMMONLIB_API void Serialize(PacketSerializer& serializer, S_EnvironmentsUpdateOwner& data);
 		TSOM_COMMONLIB_API void Serialize(PacketSerializer& serializer, S_GameData& data);
 		TSOM_COMMONLIB_API void Serialize(PacketSerializer& serializer, S_NetworkStrings& data);
+		TSOM_COMMONLIB_API void Serialize(PacketSerializer& serializer, S_PilotShip& data);
+		TSOM_COMMONLIB_API void Serialize(PacketSerializer& serializer, S_PilotShipFinish& data);
 		TSOM_COMMONLIB_API void Serialize(PacketSerializer& serializer, S_PlayerJoin& data);
 		TSOM_COMMONLIB_API void Serialize(PacketSerializer& serializer, S_PlayerLeave& data);
 		TSOM_COMMONLIB_API void Serialize(PacketSerializer& serializer, S_PlayerNameUpdate& data);
diff --git a/include/ServerLib/ServerPlayer.hpp b/include/ServerLib/ServerPlayer.hpp
@@ -48,6 +48,8 @@ namespace tsom
 
 			void ExecuteConsoleCommand(std::string_view command);
 
+			void ExitPiloting();
+
 			inline const std::shared_ptr<CharacterController>& GetCharacterController();
 			inline EntityReference& GetControlledEntityReference();
 			inline const EntityReference& GetControlledEntityReference() const;
@@ -72,6 +74,8 @@ namespace tsom
 
 			inline bool IsInEnvironment(const ServerEnvironment* environment);
 
+			void PilotShip(EntityReference shipEntity, const Nz::Quaternionf& rotation);
+
 			void PushInputs(const PlayerInputs& inputs);
 
 			void RemoveFromEnvironment(ServerEnvironment* environment);
diff --git a/include/ServerLib/SessionVisibilityHandler.hpp b/include/ServerLib/SessionVisibilityHandler.hpp
@@ -51,6 +51,8 @@ namespace tsom
 			inline bool GetEntityByNetworkId(Packets::Helper::EntityId networkId, entt::handle* entity) const;
 			inline Packets::Helper::EnvironmentId GetEnvironmentId(ServerEnvironment* environment) const;
 
+			inline void SetControlledShip(entt::handle entity);
+
 			inline void TriggerEntityRpc(entt::handle entity, Nz::UInt32 rpcIndex);
 
 			inline void UpdateControlledEntity(entt::handle entity, CharacterController* controller);
@@ -84,8 +86,8 @@ namespace tsom
 			void DispatchEntitiesProperties(Nz::UInt16 tickIndex);
 			void DispatchEntitiesRpcs(Nz::UInt16 tickIndex);
 			void DispatchEntitiesStates(Nz::UInt16 tickIndex);
-
 			void DispatchEnvironments(Nz::UInt16 tickIndex);
+
 			void HandleEntityCreation(std::vector<Packets::Helper::EntityData>& entities, entt::handle entity, CreateEntityData&& createEntityData);
 			void HandleEntityDestruction(entt::handle entity);
 
@@ -168,6 +170,7 @@ namespace tsom
 			tsl::hopscotch_map<const ServerEnvironment*, EnvironmentId> m_environmentIndices;
 			tsl::hopscotch_set<entt::handle, HandlerHasher> m_deletedEntities;
 			tsl::hopscotch_set<entt::handle, HandlerHasher> m_movingEntities;
+			std::optional<entt::handle> m_nextPilotedShip;
 			std::shared_ptr<std::size_t> m_activeChunkUpdates;
 			std::vector<ServerEnvironment*> m_destroyedEnvironments;
 			std::vector<ChunkData> m_visibleChunks;
diff --git a/include/ServerLib/SessionVisibilityHandler.inl b/include/ServerLib/SessionVisibilityHandler.inl
@@ -51,6 +51,11 @@ namespace tsom
 		return Nz::Retrieve(m_environmentIndices, environment);
 	}
 
+	inline void SessionVisibilityHandler::SetControlledShip(entt::handle entity)
+	{
+		m_nextPilotedShip = entity;
+	}
+
 	inline void SessionVisibilityHandler::TriggerEntityRpc(entt::handle entity, Nz::UInt32 rpcIndex)
 	{
 		m_triggeredEntitiesRpc[entity].push_back(rpcIndex);
diff --git a/scripts/entities/computer.lua b/scripts/entities/computer.lua
@@ -1,16 +1,5 @@
 local classData = EntityRegistry.ClassBuilder()
 
--- TODO: Replace by RPC
-classData:AddProperty("active", { type = "bool", default = false, isNetworked = true })
-
-classData:AddClientRPC("activate")
-
-if CLIENT then
-	classData:OnClientRPC("activate", function (self)
-		ClientSession.EnableShipControl(true)
-	end)
-end
-
 classData:On("init", function (self)
 	local physSettings = {
 		kind = "static",
@@ -38,8 +27,7 @@ if SERVER then
 		local computerNode = self:GetComponent("node")
 		local exteriorEntity = self:GetEnvironment():GetExteriorShipEntity()
 
-		player:GetController():SetShipController(ShipController.new(exteriorEntity, computerNode:GetRotation()))
-		self:CallClientRPC("activate", player)
+		player:PilotShip(exteriorEntity, computerNode:GetRotation())
 	end)
 end
 
diff --git a/src/ClientLib/ClientSessionHandler.cpp b/src/ClientLib/ClientSessionHandler.cpp
@@ -408,6 +408,16 @@ namespace tsom
 		GetSession()->GetStringStore().FillStore(networkStrings.startId, std::move(networkStrings.strings));
 	}
 
+	void ClientSessionHandler::HandlePacket(Packets::S_PilotShip&& pilotShip)
+	{
+		OnShipControlUpdated(true);
+	}
+
+	void ClientSessionHandler::HandlePacket(Packets::S_PilotShipFinish&& pilotShipFinish)
+	{
+		OnShipControlUpdated(false);
+	}
+
 	void ClientSessionHandler::HandlePacket(Packets::S_PlayerJoin&& playerJoin)
 	{
 		if (playerJoin.index >= m_players.size())
diff --git a/src/CommonLib/Protocol/Packets.cpp b/src/CommonLib/Protocol/Packets.cpp
@@ -430,5 +430,14 @@ namespace tsom
 			serializer &= data.index;
 			serializer &= data.newNickname;
 		}
+
+		void Serialize(PacketSerializer& serializer, S_PilotShip& data)
+		{
+			serializer &= data.shipEntity;
+		}
+
+		void Serialize(PacketSerializer& serializer, S_PilotShipFinish& data)
+		{
+		}
 	}
 }
diff --git a/src/ServerLib/Entities/ServerEntityClassLibrary.cpp b/src/ServerLib/Entities/ServerEntityClassLibrary.cpp
@@ -58,6 +58,11 @@ namespace tsom
 				if (*healthValue == 0)
 				{
 					playerInstance.TriggerClientRpc(deathRpc, nullptr);
+
+					// FIXME: Make this automatic
+					auto& playerControlled = playerEntity.get<ServerPlayerControlledComponent>();
+					playerControlled.GetPlayer()->ExitPiloting();
+
 					playerEntity.destroy();
 				}
 			}
diff --git a/src/ServerLib/Scripting/ServerScriptingLibrary.cpp b/src/ServerLib/Scripting/ServerScriptingLibrary.cpp
@@ -124,6 +124,10 @@ namespace tsom
 	{
 		state.new_usertype<ServerPlayerHandle>("Player",
 			sol::no_constructor,
+			"ExitPiloting", LuaFunction([](ServerPlayer& player)
+			{
+				return player.ExitPiloting();
+			}),
 			"GetController", LuaFunction(&ServerPlayer::GetCharacterController),
 			"GetEnvironment", LuaFunction([](ServerPlayer& player)
 			{
@@ -142,6 +146,11 @@ namespace tsom
 					return sol::nil;
 
 				return sol::make_object(L, uuidOpt->ToString());
+			}),
+			"PilotShip", LuaFunction([](ServerPlayer& player, sol::table shipEntity, const Nz::Quaternionf& rotation)
+			{
+				entt::handle entity = AssertScriptEntity(shipEntity);
+				return player.PilotShip(entity, rotation);
 			})
 		);
 	}
diff --git a/src/ServerLib/ServerPlayer.cpp b/src/ServerLib/ServerPlayer.cpp
@@ -5,6 +5,7 @@
 #include <ServerLib/ServerPlayer.hpp>
 #include <CommonLib/CharacterController.hpp>
 #include <CommonLib/ConsoleExecutor.hpp>
+#include <CommonLib/ShipController.hpp>
 #include <CommonLib/Scripting/AssetScriptingLibrary.hpp>
 #include <CommonLib/Scripting/ChunkScriptingLibrary.hpp>
 #include <CommonLib/Scripting/MathScriptingLibrary.hpp>
@@ -128,6 +129,15 @@ namespace tsom
 		m_console->executor.Execute(command, "remote client");
 	}
 
+	void ServerPlayer::ExitPiloting()
+	{
+		if (!m_controlledEntity)
+			return;
+
+		m_controller->SetShipController(nullptr);
+		m_visibilityHandler.SetControlledShip({});
+	}
+
 	ServerEnvironment* ServerPlayer::GetControlledEntityEnvironment()
 	{
 		if (!m_controlledEntity)
@@ -144,6 +154,15 @@ namespace tsom
 		return ServerEnvironment::GetEnvironment(m_controlledEntity);
 	}
 
+	void ServerPlayer::PilotShip(EntityReference shipEntity, const Nz::Quaternionf& rotation)
+	{
+		if (!m_controlledEntity)
+			return;
+
+		m_controller->SetShipController(std::make_shared<ShipController>(shipEntity, rotation));
+		m_visibilityHandler.SetControlledShip(shipEntity);
+	}
+
 	void ServerPlayer::PushInputs(const PlayerInputs& inputs)
 	{
 		if (m_inputBuffer.size() == m_inputBuffer.capacity())
@@ -167,6 +186,8 @@ namespace tsom
 	{
 		assert(IsInEnvironment(environment));
 
+		ExitPiloting();
+
 		if (m_controlledEntity)
 			m_controlledEntity->destroy();
 
diff --git a/src/ServerLib/Session/PlayerSessionHandler.cpp b/src/ServerLib/Session/PlayerSessionHandler.cpp
@@ -49,6 +49,8 @@ namespace tsom
 		{ PacketIndex<Packets::S_EnvironmentDestroy>,      { .channel = 1, .flags = Nz::ENetPacketFlag::Reliable } },
 		{ PacketIndex<Packets::S_EnvironmentsUpdateOwner>, { .channel = 1, .flags = Nz::ENetPacketFlag::Reliable } },
 		{ PacketIndex<Packets::S_GameData>,                { .channel = 1, .flags = Nz::ENetPacketFlag::Reliable } },
+		{ PacketIndex<Packets::S_PilotShip>,               { .channel = 1, .flags = Nz::ENetPacketFlag::Reliable } },
+		{ PacketIndex<Packets::S_PilotShipFinish>,         { .channel = 1, .flags = Nz::ENetPacketFlag::Reliable } },
 		{ PacketIndex<Packets::S_PlayerJoin>,              { .channel = 1, .flags = Nz::ENetPacketFlag::Reliable } },
 		{ PacketIndex<Packets::S_PlayerLeave>,             { .channel = 1, .flags = Nz::ENetPacketFlag::Reliable } },
 		{ PacketIndex<Packets::S_PlayerNameUpdate>,        { .channel = 1, .flags = Nz::ENetPacketFlag::Reliable } },
@@ -69,7 +71,7 @@ namespace tsom
 
 	void PlayerSessionHandler::HandlePacket(Packets::C_ExitShipControl&& exitShipControl)
 	{
-		m_player->GetCharacterController()->SetShipController(nullptr);
+		m_player->ExitPiloting();
 	}
 
 	void PlayerSessionHandler::HandlePacket(Packets::C_Interact&& interact)
diff --git a/src/ServerLib/SessionVisibilityHandler.cpp b/src/ServerLib/SessionVisibilityHandler.cpp
@@ -437,6 +437,21 @@ namespace tsom
 		DispatchEntitiesDeletion(tickIndex);
 		DispatchEntitiesCreation(tickIndex);
 		DispatchEntitiesStates(tickIndex);
+
+		if (m_nextPilotedShip)
+		{
+			if (*m_nextPilotedShip)
+			{
+				Packets::S_PilotShip pilotShip;
+				pilotShip.shipEntity = Nz::Retrieve(m_entityIndices, *m_nextPilotedShip);
+
+				m_networkSession->SendPacket(pilotShip);
+			}
+			else
+				m_networkSession->SendPacket(Packets::S_PilotShipFinish{});
+
+			m_nextPilotedShip = std::nullopt;
+		}
 	}
 
 	void SessionVisibilityHandler::DispatchEntitiesCreation(Nz::UInt16 tickIndex)

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,11 @@ namespace tsom`
`51`	`51`	`return Nz::Retrieve(m_environmentIndices, environment);`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ inline void SessionVisibilityHandler::SetControlledShip(entt::handle entity)`
	`55`	`+ {`
	`56`	`+ m_nextPilotedShip = entity;`
	`57`	`+ }`
	`58`	`+`
`54`	`59`	`inline void SessionVisibilityHandler::TriggerEntityRpc(entt::handle entity, Nz::UInt32 rpcIndex)`
`55`	`60`	`{`
`56`	`61`	`m_triggeredEntitiesRpc[entity].push_back(rpcIndex);`
Original file line number	Diff line number	Diff line change
`@@ -430,5 +430,14 @@ namespace tsom`
`430`	`430`	`serializer &= data.index;`
`431`	`431`	`serializer &= data.newNickname;`
`432`	`432`	`}`
	`433`	`+`
	`434`	`+ void Serialize(PacketSerializer& serializer, S_PilotShip& data)`
	`435`	`+ {`
	`436`	`+ serializer &= data.shipEntity;`
	`437`	`+ }`
	`438`	`+`
	`439`	`+ void Serialize(PacketSerializer& serializer, S_PilotShipFinish& data)`
	`440`	`+ {`
	`441`	`+ }`
`433`	`442`	`}`
`434`	`443`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,11 @@ namespace tsom`
`58`	`58`	`if (*healthValue == 0)`
`59`	`59`	`{`
`60`	`60`	`playerInstance.TriggerClientRpc(deathRpc, nullptr);`
	`61`	`+`
	`62`	`+ // FIXME: Make this automatic`
	`63`	`+ auto& playerControlled = playerEntity.get<ServerPlayerControlledComponent>();`
	`64`	`+ playerControlled.GetPlayer()->ExitPiloting();`
	`65`	`+`
`61`	`66`	`playerEntity.destroy();`
`62`	`67`	`}`
`63`	`68`	`}`