Fix server's vessel count, ensure intial sync only happens after flig…

…ht scene fully ready, always handle updates during initial sync fully Fixes #605
TehGimp · Mar 14, 2014 · d3f4b67 · d3f4b67
1 parent eb4525f
commit d3f4b67
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/KMPManager.cs b/KMPManager.cs
@@ -1970,7 +1970,7 @@ private void applyVesselUpdate(KMPVesselUpdate vessel_update, KMPVessel vessel)
 			if (vessel_update.getProtoVesselNode() != null) serverVessels_ProtoVessels[vessel_update.id] = vessel_update.getProtoVesselNode();
 
 			//Apply update if able
-			if (isInFlightOrTracking)
+			if (isInFlightOrTracking || syncing)
 			{
 				if (vessel_update.relativeTo == Guid.Empty && (vessel_update.id != FlightGlobals.ActiveVessel.id || (serverVessels_InUse[vessel_update.id] || (serverVessels_IsPrivate[vessel_update.id] && !serverVessels_IsMine[vessel_update.id]))))
 				{
@@ -2683,7 +2683,7 @@ private void addRemoteVessel(ProtoVessel protovessel, Guid vessel_id, KMPVessel
 			if (protovessel.vesselType == VesselType.Flag) {
 				Invoke("ClearFlagLock", 5f);
 			}
-            if (!vesselUpdatesLoaded.Contains(vessel_id))
+			if (!vesselUpdatesLoaded.Contains(vessel_id)) //This can be moved elsewhere in addRemoteVessel (or applyVesselUpdate) to help track issues with loading a specific vessel
             {
                 vesselUpdatesLoaded.Add(vessel_id);
             }
@@ -3416,13 +3416,19 @@ private void OnFirstFlightReady()
 				GameEvents.onFlightReady.Add(this.OnFlightReady);
 				MapView.EnterMapView();
 				MapView.MapCamera.SetTarget("Kerbin");
-				StartCoroutine(sendSubspaceSyncRequest(-1,true));
+				Invoke("sendInitialSyncRequest",0.5f);
 				Invoke("handleSyncTimeout",300f);
 				docking = false;
 			}
 			delayForceQuit = false;
 		}
-
+
+		private void sendInitialSyncRequest()
+		{
+			if (isInFlightOrTracking) StartCoroutine(sendSubspaceSyncRequest(-1,true));
+			else Invoke("sendInitialSyncRequest",0.25f);
+		}
+
 		private void OnFlightReady()
 		{
 			removeKMPControlLocks ();

diff --git a/KMPServer/Server.cs b/KMPServer/Server.cs
@@ -906,8 +906,15 @@ record =>
 
         private int countShipsInDatabase()
         {
-            int count = Convert.ToInt32(Database.ExecuteScalar("SELECT COUNT(*) FROM kmpVessel WHERE Destroyed IS NULL;"));
-			Log.Debug("Vessel count: {0}", count);
+            int count = Convert.ToInt32(Database.ExecuteScalar("SELECT COUNT(*)" +
+                    " FROM kmpVesselUpdate vu" +
+                    " INNER JOIN kmpVessel v ON v.Guid = vu.Guid AND v.Destroyed IS NULL" +
+                    " INNER JOIN kmpSubspace s ON s.ID = vu.Subspace" +
+                    " INNER JOIN" +
+                    "  (SELECT vu.Guid, MAX(s.LastTick) AS LastTick" +
+                    "  FROM kmpVesselUpdate vu" +
+                    "  INNER JOIN kmpSubspace s ON s.ID = vu.Subspace" +
+                    "  GROUP BY vu.Guid) t ON t.Guid = vu.Guid AND t.LastTick = s.LastTick"));
             return count; // TODO: @NeverCast, Give ExecuteScalar a generic overload
         }