Merge Logistics Processors

NebulaModTeam · Jul 24, 2021 · f7076e6 · f7076e6
1 parent 9d3824b
commit f7076e6
Show file tree

Hide file tree

Showing 20 changed files with 304 additions and 337 deletions.
diff --git a/Nebula.sln b/Nebula.sln
@@ -17,13 +17,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		version.json = version.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NebulaHost", "NebulaHost\NebulaHost.csproj", "{1927F7FF-230B-4B1B-B7ED-34B58730AFBE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NebulaWorld", "NebulaWorld\NebulaWorld.csproj", "{28AEA139-FB22-4672-AF51-28B728CF2978}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "websocket-sharp", "dep\websocket-sharp\websocket-sharp\websocket-sharp.csproj", "{B357BAC7-529E-4D81-A0D2-71041B19C8DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NebulaNetwork", "NebulaNetwork\NebulaNetwork.csproj", "{36A3D8AE-2A0A-4A1F-8A65-4FB61B01F779}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NebulaNetwork", "NebulaNetwork\NebulaNetwork.csproj", "{36A3D8AE-2A0A-4A1F-8A65-4FB61B01F779}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,10 +37,6 @@ Global
 		{28B0716C-3926-4865-AB43-6C4431D022D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28B0716C-3926-4865-AB43-6C4431D022D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28B0716C-3926-4865-AB43-6C4431D022D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1927F7FF-230B-4B1B-B7ED-34B58730AFBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1927F7FF-230B-4B1B-B7ED-34B58730AFBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1927F7FF-230B-4B1B-B7ED-34B58730AFBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1927F7FF-230B-4B1B-B7ED-34B58730AFBE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{28AEA139-FB22-4672-AF51-28B728CF2978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{28AEA139-FB22-4672-AF51-28B728CF2978}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28AEA139-FB22-4672-AF51-28B728CF2978}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/NebulaHost/PacketProcessors/Logistics/ILSRemoteOrderBroadcastProcessor.cs b/NebulaHost/PacketProcessors/Logistics/ILSRemoteOrderBroadcastProcessor.cs
diff --git a/NebulaHost/PacketProcessors/Logistics/ILSRequestShipDockProcessor.cs b/NebulaHost/PacketProcessors/Logistics/ILSRequestShipDockProcessor.cs
diff --git a/NebulaHost/PacketProcessors/Logistics/ILSShipBroadcastProcessor.cs b/NebulaHost/PacketProcessors/Logistics/ILSShipBroadcastProcessor.cs
diff --git a/NebulaHost/PacketProcessors/Logistics/ILSShipItemsBroadcastProcessor.cs b/NebulaHost/PacketProcessors/Logistics/ILSShipItemsBroadcastProcessor.cs
diff --git a/NebulaHost/PacketProcessors/Logistics/ILSUpdateSlotDataProcessor.cs b/NebulaHost/PacketProcessors/Logistics/ILSUpdateSlotDataProcessor.cs
diff --git a/NebulaHost/PacketProcessors/Logistics/StationUIBroadcaster.cs b/NebulaHost/PacketProcessors/Logistics/StationUIBroadcaster.cs
diff --git a/...cs/ILSArriveStarPlanetRequestProcessor.cs → ...cs/ILSArriveStarPlanetRequestProcessor.cs b/...cs/ILSArriveStarPlanetRequestProcessor.cs → ...cs/ILSArriveStarPlanetRequestProcessor.cs
@@ -14,12 +14,16 @@ namespace NebulaNetwork.PacketProcessors.Logistics
     class ILSArriveStarPlanetRequestProcessor: PacketProcessor<ILSArriveStarPlanetRequest>
     {
         private PlayerManager playerManager;
+
         public ILSArriveStarPlanetRequestProcessor()
         {
-            playerManager = MultiplayerHostSession.Instance.PlayerManager;
+            playerManager = MultiplayerHostSession.Instance?.PlayerManager;
         }
+
         public override void ProcessPacket(ILSArriveStarPlanetRequest packet, NebulaConnection conn)
         {
+            if (IsClient) return;
+
             Player player = playerManager.GetPlayer(conn);
             if (player == null)
             {

diff --git a/NebulaNetwork/PacketProcessors/Logistics/ILSArriveStarPlanetResponseProcessor.cs b/NebulaNetwork/PacketProcessors/Logistics/ILSArriveStarPlanetResponseProcessor.cs
@@ -11,6 +11,8 @@ class ILSArriveStarPlanetResponseProcessor: PacketProcessor<ILSArriveStarPlanetR
     {
         public override void ProcessPacket(ILSArriveStarPlanetResponse packet, NebulaConnection conn)
         {
+            if (IsHost) return;
+
             StationComponent[] gStationPool = null;
             if (packet.Planet == 0) // arrive at solar system
             {

diff --git a/NebulaNetwork/PacketProcessors/Logistics/ILSRemoteOrderProcessor.cs b/NebulaNetwork/PacketProcessors/Logistics/ILSRemoteOrderProcessor.cs
@@ -9,9 +9,28 @@ namespace NebulaNetwork.PacketProcessors.Logistics
     [RegisterPacketProcessor]
     class ILSRemoteOrderProcessor : PacketProcessor<ILSRemoteOrderData>
     {
+        private PlayerManager playerManager;
+
+        public ILSRemoteOrderProcessor()
+        {
+            playerManager = MultiplayerHostSession.Instance?.PlayerManager;
+        }
+
         public override void ProcessPacket(ILSRemoteOrderData packet, NebulaConnection conn)
         {
-            SimulatedWorld.OnILSRemoteOrderUpdate(packet);
+            if (IsHost)
+            {
+                Player player = playerManager.GetPlayer(conn);
+                if (player != null)
+                    playerManager.SendPacketToOtherPlayers(packet, player);
+
+                // TODO: Don't we need to call SimulatedWorld.OnILSRemoteOrderUpdate() here too ??
+            }
+
+            if (IsClient)
+            {
+                SimulatedWorld.OnILSRemoteOrderUpdate(packet);
+            }
         }
     }
 }