Merge pull request #154 from InvalidArgument3/initialversion

hnng
StarCoreSE · Oct 19, 2024 · 9e240d0 · 9e240d0
2 parents dd40264 + 2e265c8
commit 9e240d0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Slipspace Engine/Data/Scripts/WarpDrive/WarpSystem.cs b/Slipspace Engine/Data/Scripts/WarpDrive/WarpSystem.cs
@@ -1327,7 +1327,6 @@ private List<IMyFunctionalBlock> GetActiveWarpDrives()
 
         public void Dewarp(bool Collision = false)
         {
-
             // Check if we've been in warp for more than 1 minute (assuming 60 updates per second)
             if (WarpState == State.Active &&
                 grid?.MainGrid != null &&
@@ -1343,8 +1342,8 @@ public void Dewarp(bool Collision = false)
                     ? MyColorPickerConstants.HSVOffsetToHSV(faction.CustomColor).HSVtoColor()
                     : Color.Black; // Default color if no faction
 
-                // Ensure this is only run on the server (dedicated or host) to avoid multiple executions
-                if (!(MyAPIGateway.Multiplayer.IsServer || MyAPIGateway.Utilities.IsDedicated))
+                // Server-only block for adding GPS
+                if (MyAPIGateway.Multiplayer.IsServer || MyAPIGateway.Utilities.IsDedicated)
                 {
                     // Only the server or dedicated server adds the GPS marker once, visible to all players
                     MyVisualScriptLogicProvider.AddGPSForAll(
@@ -1353,10 +1352,10 @@ public void Dewarp(bool Collision = false)
                         exitPosition,
                         gpsColor,
                         30);
-                };
+                }
             }
 
-
+            // The rest of Dewarp() executes on both client and server to maintain synchronization
 
             if (PlayersInWarpList.Count > 0)
             {
@@ -1378,6 +1377,7 @@ public void Dewarp(bool Collision = false)
             var MainGrid = grid.MainGrid;
             var WarpDriveOnGrid = GetActiveWarpDrive(MainGrid);
 
+            // Sending network message to other players for warp state changes
             if (WarpDriveOnGrid != null && WarpState == State.Active && (MyAPIGateway.Multiplayer.IsServer || MyAPIGateway.Utilities.IsDedicated))
             {
                 if (WarpDriveOnGrid != null)