gg.easy.airship 0.1.2193 → 0.1.2194

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs

@@ -23,7 +23,13 @@ namespace Editor.Accessories.Clothing {
     [CustomEditor(typeof(PlatformGearBundleManifest))]
     [CanEditMultipleObjects]
     public class PlatformGearBundleManifestEditor : UnityEditor.Editor {
+#if AIRSHIP_STAGING
+        private static string easyOrgId = "6536df9f3843ac629cf3b8b1";
+        private static string defaultImageId = "b5f260d4-2678-4255-b9bd-9136dd3edf36";
+#else
         private static string easyOrgId = "6b62d6e3-9d74-449c-aeac-b4feed2012b1";
+        private static string defaultImageId = "64351892-40d4-409b-ab3a-501818213b50";
+#endif
         private bool skipBuild = false;
 
         [MenuItem("Airship/Internal/Publish All Platform Gear")]
@@ -140,7 +146,7 @@ namespace Editor.Accessories.Clothing {
                 // Create a new class id
                 var data = JsonUtility.ToJson(new GearCreateRequest() {
                     name = gear.name,
-                    imageId = "64351892-40d4-409b-ab3a-501818213b50",
+                    imageId = defaultImageId,
                     description = "Clothing",
                     airAssets = new string[] { },
                     category = category,

package/Editor/CreateAssetBundles.cs

@@ -5,6 +5,7 @@ using System.IO;
 using System.Linq;
 using Code.Bootstrap;
 using Editor.Packages;
+using Editor.Publish.Callback;
 using UnityEditor.Build.Pipeline;
 using UnityEditor.Build.Pipeline.Interfaces;
 using UnityEditor.Build.Pipeline.Tasks;
@@ -344,9 +345,7 @@ public static class CreateAssetBundles {
 					addressableNames = addressableNames
 				};
 				builds.Add(build);
-			} else {
-				if (assetBundleName != "shared/resources") continue;
-
+			} else if (assetBundleName == "shared/resources") {
 				var assetGuids = AssetDatabase.FindAssets("*", new string[] {"Assets/Resources"}).ToHashSet();
 				if (AssetDatabase.AssetPathExists("Assets/Airship.asbuildinfo")) {
 					assetGuids.Add(AssetDatabase.AssetPathToGUID("Assets/Airship.asbuildinfo"));
@@ -416,14 +415,6 @@ public static class CreateAssetBundles {
 		buildParams.BundleCompression = BuildCompression.LZ4;
 		var buildContent = new BundleBuildContent(builds);
 
-		// Debug.Log("Additional files:");
-		// foreach (var pair in buildContent.AdditionalFiles) {
-		// 	Debug.Log(pair.Key + ":");
-		// 	foreach (var p in pair.Value) {
-		// 		Debug.Log("  - " + p.fileAlias);
-		// 	}
-		// }
-
 		ContentPipeline.BuildCallbacks.PostPackingCallback = (parameters, data, arg3) => {
 			return ReturnCode.Success;
 		};
@@ -431,6 +422,9 @@ public static class CreateAssetBundles {
 		AirshipPackagesWindow.buildingPackageId = "game";
 		buildingBundles = true;
 		AirshipScriptableBuildPipelineConfig.buildingGameBundles = true;
+		// Allow other logic to hook into pre build game bundles (used for setting up scriptable shader
+		// scripting based on target).
+		BuildAirshipGameBundleProcessor.InvokePreBuildGameBundle(buildTarget);
 		ReturnCode returnCode = ContentPipeline.BuildAssetBundles(buildParams, buildContent, out var result);
 		buildingBundles = false;
 		AirshipScriptableBuildPipelineConfig.buildingGameBundles = false;

package/Editor/Publish/Callback/IBuildAirshipGameBundle.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEngine;
+
+namespace Editor.Publish.Callback {
+    public interface IBuildAirshipGameBundle : IOrderedCallback {
+        /// <summary>
+        /// Fired before building asset bundles for game
+        /// </summary>
+        void OnPreBuildGameBundle(BuildTarget buildTarget);
+    }
+    
+    [InitializeOnLoad]
+    public static class BuildAirshipGameBundleProcessor {
+        private static List<IBuildAirshipGameBundle> callbacks;
+        
+        static BuildAirshipGameBundleProcessor() {
+            callbacks = GetCallbackInstances();
+        }
+        
+        public static void InvokePreBuildGameBundle(BuildTarget target) {
+            foreach (var callback in callbacks) {
+                try {
+                    callback.OnPreBuildGameBundle(target);
+                } catch (Exception e) {
+                    Debug.LogError(e);
+                }
+            }
+        }
+        
+        /// <summary>
+        /// Create instances of each implementation of IBuildAirshipGameBundle
+        /// </summary>
+        private static List<IBuildAirshipGameBundle> GetCallbackInstances() {
+            var instances = new List<IBuildAirshipGameBundle>();
+
+            var derivedTypes = TypeCache.GetTypesDerivedFrom<IBuildAirshipGameBundle>();
+            foreach (var type in derivedTypes) {
+                var instance = (IBuildAirshipGameBundle) Activator.CreateInstance(type);
+                instances.Add(instance);   
+            }
+            return instances.OrderBy(i => i.callbackOrder).ToList();
+        }
+    }
+}

package/Editor/Publish/Callback/IBuildAirshipGameBundle.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f2e2ed287f3d4bf3b9c35d62abcf1ae0
+timeCreated: 1762807654

package/Editor/Publish/Callback.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e745493002eb40668673cc8bce661f2f
+timeCreated: 1762807626

package/Editor/Publish/Deploy.cs

@@ -51,21 +51,7 @@ public class Deploy {
 		// Sort the current platform first to speed up build time
 		List<AirshipPlatform> platforms = new();
 
-#if UNITY_EDITOR_OSX
-		platforms.Add(AirshipPlatform.Windows);
-		platforms.Add(AirshipPlatform.Mac);
-#else
-		platforms.Add(AirshipPlatform.Windows);
-		platforms.Add(AirshipPlatform.Mac);
-#endif
-
-		var gameConfig = GameConfig.Load();
-		if (gameConfig.supportsMobile) {
-			platforms.Add(AirshipPlatform.iOS);
-			platforms.Add(AirshipPlatform.Android);
-		}
-
-		EditorCoroutines.Execute((BuildAndDeploy(platforms.ToArray(), false)));
+		EditorCoroutines.Execute(BuildAndDeploy());
 	}
 
 	[MenuItem("Airship/Misc/Build Game Asset Bundle")]
@@ -86,12 +72,8 @@ public class Deploy {
 	}
 
 	[MenuItem("Airship/Publish Game (No Cache)", priority = 51)]
-	public static void PublishWithoutCache()
-	{
-		// Make sure we generate and write all `NetworkPrefabCollection`s before we
-		// build the game.
-		// NetworkPrefabManager.WriteAllCollections();
-		EditorCoroutines.Execute((BuildAndDeploy(AirshipPlatformUtil.livePlatforms, false, false)));
+	public static void PublishWithoutCache() {
+		EditorCoroutines.Execute(BuildAndDeploy(false, false));
 	}
 
 	private static string GetDeployKey(DeployAuthType authType) {
@@ -106,6 +88,28 @@ public class Deploy {
 		throw new Exception($"[Airship] Unknown auth type: {authType}");
 	}
 
+	/// <summary>
+	/// BuildAndDeploy with the target platforms defined in GameConfig. Should only be used in asset deployments
+	/// (not code only).
+	/// </summary>
+	private static IEnumerator BuildAndDeploy(bool skipBuild = false, bool useCache = true, bool dontUpload = false) {
+		var platforms = new List<AirshipPlatform>();
+#if UNITY_EDITOR_OSX
+		platforms.Add(AirshipPlatform.Windows);
+		platforms.Add(AirshipPlatform.Mac);
+#else
+		platforms.Add(AirshipPlatform.Windows);
+		platforms.Add(AirshipPlatform.Mac);
+#endif
+
+		var gameConfig = GameConfig.Load();
+		if (gameConfig.supportsMobile) {
+			platforms.Add(AirshipPlatform.iOS);
+			platforms.Add(AirshipPlatform.Android);
+		}
+		return BuildAndDeploy(platforms.ToArray(), skipBuild, useCache, dontUpload);
+	}
+
 	private static IEnumerator BuildAndDeploy(AirshipPlatform[] platforms, bool skipBuild = false, bool useCache = true, bool dontUpload = false) {
 		var possibleKeys = new List<string> { GetDeployKey(DeployAuthType.DeployKey), GetDeployKey(DeployAuthType.EditorAuthToken) };
 		possibleKeys.RemoveAll(string.IsNullOrEmpty);
@@ -345,6 +349,9 @@ public class Deploy {
 			var success = CreateAssetBundles.BuildPlatforms(platforms, useCache);
 			if (!success) {
 				Debug.Log("Cancelled publish.");
+				
+				// Switch back to starting build target
+				EditorUserBuildSettings.SwitchActiveBuildTarget(startingBuildGroup, startingBuildTarget);
 				yield break;
 			}
 

package/Editor/Quality/QualityConfig.cs

@@ -1,6 +1,7 @@
 #if UNITY_EDITOR
 using System;
 using UnityEditor;
+using UnityEditor.Build;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
@@ -16,7 +17,14 @@ namespace Editor.Quality {
         [MenuItem("Airship/Quality/Config Mobile")]
 #endif
         public static void ConfigureLowQualityLevel() {
-            SwapToQualityLevel(LOW_QUALITY_NAME);
+            var index = GetOrCreateQualityLevel(LOW_QUALITY_NAME);
+            // Switch to it so QualitySettings.* edits apply to the right level
+            QualitySettings.SetQualityLevel(index, true);
+            ConfigureSupportedPlatforms(index, 
+                new []{ NamedBuildTarget.Android, NamedBuildTarget.iOS, },
+                new []{ NamedBuildTarget.Standalone }
+                );
+            
             ConfigureForLow();
             SaveChangesToQualitySettings();
         }
@@ -25,11 +33,31 @@ namespace Editor.Quality {
         [MenuItem("Airship/Quality/Config Normal")]
 #endif
         public static void ConfigureNormalQualityLevel() {
-            SwapToQualityLevel(NORMAL_QUALITY_NAME);
+            var index = GetOrCreateQualityLevel(NORMAL_QUALITY_NAME);
+            // Switch to it so QualitySettings.* edits apply to the right level
+            QualitySettings.SetQualityLevel(index, true);
+            ConfigureSupportedPlatforms(index, 
+                new []{ NamedBuildTarget.Standalone }, 
+                new []{ NamedBuildTarget.Android, NamedBuildTarget.iOS, }
+                );
+            
             ConfigureForNormal();
             SaveChangesToQualitySettings();
         }
 
+        private static void ConfigureSupportedPlatforms(int index, NamedBuildTarget[] included, NamedBuildTarget[] excluded) {
+            foreach (var target in included) {
+                if (!QualitySettings.TryIncludePlatformAt(target.TargetName, index, out var ex)) {
+                    Debug.LogError($"Failed to configure included platforms for quality level: {ex}");
+                }
+            }
+            foreach (var target in excluded) {
+                if (!QualitySettings.TryExcludePlatformAt(target.TargetName, index, out var ex)) {
+                    Debug.LogError($"Failed to configure excluded platforms for quality level: {ex}");
+                }
+            }
+        }
+
         private static void ConfigureForLow() {
             // At a value of 1 this reduces the max texture mipmap level to half resolution.
             QualitySettings.globalTextureMipmapLimit = 1;
@@ -88,21 +116,20 @@ namespace Editor.Quality {
             pipeline.shadowCascadeCount = 2;
             pipeline.cascade4Split = new Vector3(0.067f, 0.2f, 0.467f);
         }
-
-        private static void SwapToQualityLevel(string name) {
-            int index = GetQualityIndex(name);
+        
+        /// <summary>
+        /// Returns the index of the quality level with given name. Will create a new quality level if none
+        /// exist with the name.
+        /// </summary>
+        private static int GetOrCreateQualityLevel(string name) {
+            var index = GetQualityIndex(name);
             if (index < 0) {
                 if (!TryAddQualityLevel(name, out index)) {
-                    Debug.LogError("Failed to add Mobile quality level. See console for details.");
-                    return;
+                    throw new Exception("Failed to create quality level.");
                 }
                 Debug.Log($"Created quality level '{name}' at index {index}.");
-            } else {
-                Debug.Log($"Found existing quality level '{name}' at index {index}.");
             }
-
-            // Switch to it so QualitySettings.* edits apply to the right level
-            QualitySettings.SetQualityLevel(index, true);
+            return index;
         }
 
         private static void SaveChangesToQualitySettings() {

package/Editor/Settings/AirshipSettingsProvider.cs

@@ -38,6 +38,7 @@ public class AirshipSettingsProvider : SettingsProvider
     private bool showAutomaticEditorIntegrations = true;
     private bool showLuauOptions = true;
     private bool showNetworkOptions = true;
+    private bool showVoxelWorldOptions = false;
     private bool showBetaOptions = false;
 
     bool showGithubAccessToken = false;
@@ -209,6 +210,22 @@ public class AirshipSettingsProvider : SettingsProvider
             }
         }
         EditorGUILayout.EndFoldoutHeaderGroup();
+        
+        EditorGUILayout.Space();
+        showVoxelWorldOptions = EditorGUILayout.BeginFoldoutHeaderGroup(showVoxelWorldOptions, "Voxel World");
+        if (showVoxelWorldOptions) {
+            EditorGUILayout.HelpBox("Updating Server View Rendering requires you to restart multiplayer play mode window", MessageType.Warning);
+            VoxelWorldEditorConfig.instance.renderVoxelWorldInServerView = EditorGUILayout.Toggle(
+                new GUIContent(
+                    "Server View Rendering", 
+                    "When enabled the Voxel World will be visible in dedicated server view. This is an editor only preference that results in worse performance (but can be useful for debugging)."
+                ), VoxelWorldEditorConfig.instance.renderVoxelWorldInServerView);
+            
+            if (GUI.changed) {
+                VoxelWorldEditorConfig.instance.Modify();
+            }
+        }
+        EditorGUILayout.EndFoldoutHeaderGroup();
 
         // EditorGUILayout.Space();
         // showBetaOptions = EditorGUILayout.BeginFoldoutHeaderGroup(showBetaOptions, "Betas");

package/Runtime/Code/AirshipConst.cs

@@ -6,7 +6,7 @@ using UnityEngine.Scripting;
 namespace Code {
     [LuauAPI][Preserve]
     public static class AirshipConst {
-        public const int playerVersion = 20;
+        public const int playerVersion = 21;
         public static readonly IReadOnlyList<string> playerFlags = new string[] {
             "SkipLoading",
             "LagCompCheckIdIsInt",
@@ -17,6 +17,6 @@ namespace Code {
         /// <summary>
         /// The server will kick clients that have a playerVersion lower than this value.
         /// </summary>
-        public const int minAcceptedPlayerVersionOnServer = 20;
+        public const int minAcceptedPlayerVersionOnServer = 21;
     }
 }

package/Runtime/Code/CoreUI/Components/AirshipVersionOverlay.cs

@@ -0,0 +1,21 @@
+using Code.Bundles;
+using TMPro;
+using UnityEngine;
+
+namespace Code.CoreUI.Components {
+    public class AirshipVersionOverlay : MonoBehaviour {
+        public TMP_Text versionText;
+
+        private void Start() {
+#if !AIRSHIP_PLAYER
+            if (Application.isEditor) {
+                this.versionText.gameObject.SetActive(false);
+                return;
+            }
+#endif
+
+            var hash = AirshipVersion.GetVersionHash();
+            this.versionText.text = Application.version + "-" + hash;
+        }
+    }
+}

package/Runtime/Code/CoreUI/Components/AirshipVersionOverlay.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cc41e11900334dc284bc9b2dd63d0ed7
+timeCreated: 1762977812

package/Runtime/Code/Luau/LuauAssembly/BinaryBlob.cs

@@ -4,6 +4,7 @@ using System.Runtime.InteropServices;
 using Mirror;
 using Code.Util;
 using Code.Zstd;
+using UnityEngine;
 
 namespace Assets.Luau {
     [Serializable]
@@ -100,7 +101,7 @@ namespace Assets.Luau {
             NetworkWriterPool.Return(writer);
             NetworkWriterPool.Return(changedByteWriter);
             
-            // Debug.Log($"Final diff is {bytes.Length} bytes");
+            // Debug.Log($"Final diff is {bytes.Length} bytes. Base data was {Data.Length}, new data was {other.Data.Length}. Change bytes: {changeBytes.Length}, Change data: {newByteValues.Length}");
             return bytes;
         }
 

package/Runtime/Code/Luau/LuauCoreCallbacks.cs

@@ -703,6 +703,9 @@ public partial class LuauCore : MonoBehaviour {
         }
     }
 
+    /// <summary>
+    /// Returns field value for a blittable object by directly accessing memory. Won't work for managed types.
+    /// </summary>
     private static unsafe T GetFieldValue<T>(object instance, FieldInfo fieldInfo) where T : unmanaged {
         var addr = UnsafeUtility.PinGCObjectAndGetAddress(instance, out ulong handle);
         try {
@@ -1120,6 +1123,8 @@ public partial class LuauCore : MonoBehaviour {
         if (cacheData.memberInfo is not FieldInfo fieldInfo) throw new Exception("FastGetAndWriteValueField must be called with FieldInfo.");
         
         var fieldType = cacheData.memberType;
+        // GetFieldValue only works reliably with blittable types
+        if (!UnsafeUtility.IsBlittable(cacheData.objectType)) return false;
         
         if (fieldType == intType) {
             var intValue = GetFieldValue<int>(objectReference, fieldInfo);

package/Runtime/Code/LuauAPI/GameObjectAPI.cs

@@ -350,13 +350,18 @@ public class GameObjectAPI : BaseLuaAPIClass {
             var gameObject = (GameObject)targetObject;
             
             Type objectType = LuauCore.CoreInstance.GetTypeFromString(typeName);
-            if (objectType == null)
-            {
+            if (objectType == null) {
                 ThreadDataManager.Error(thread);
                 Debug.LogError("Error: GetComponentsInChildren component type not found: " + typeName + " (consider registering it?)");
                 return 0;
             }
-            var results = gameObject.GetComponentsInChildren(objectType);
+
+            var includeInactive = false;
+            if (numParameters >= 2) {
+                includeInactive = LuauCore.GetParameterAsBool(1, numParameters, parameterDataPODTypes, parameterDataPtrs, parameterDataSizes, out _);
+            }
+            
+            var results = gameObject.GetComponentsInChildren(objectType, includeInactive);
             LuauCore.WritePropertyToThread(thread, results, typeof(Component[]));
             return 1;
         }
@@ -380,7 +385,13 @@ public class GameObjectAPI : BaseLuaAPIClass {
                 Debug.LogError("Error: GetComponentsInParent component type not found: " + typeName + " (consider registering it?)");
                 return 0;
             }
-            var results = gameObject.GetComponentsInParent(objectType);
+            
+            var includeInactive = false;
+            if (numParameters >= 2) {
+                includeInactive = LuauCore.GetParameterAsBool(1, numParameters, parameterDataPODTypes, parameterDataPtrs, parameterDataSizes, out _);
+            }
+            
+            var results = gameObject.GetComponentsInParent(objectType, includeInactive);
             LuauCore.WritePropertyToThread(thread, results, typeof(Component[]));
             return 1;
         }

package/Runtime/Code/LuauAPI/TransformAPI.cs

@@ -135,7 +135,13 @@ public class TransformAPI : BaseLuaAPIClass {
                 Debug.LogError("Error: GetComponentsInChildren component type not found: " + typeName + " (consider registering it?)");
                 return 0;
             }
-            var results = t.GetComponentsInChildren(objectType);
+            
+            var includeInactive = false;
+            if (numParameters >= 2) {
+                includeInactive = LuauCore.GetParameterAsBool(1, numParameters, parameterDataPODTypes, parameterDataPtrs, parameterDataSizes, out _);
+            }
+            
+            var results = t.GetComponentsInChildren(objectType, includeInactive);
             LuauCore.WritePropertyToThread(thread, results, typeof(Component[]));
             return 1;
         }
@@ -156,7 +162,13 @@ public class TransformAPI : BaseLuaAPIClass {
                 Debug.LogError("Error: GetComponentsInParent component type not found: " + typeName + " (consider registering it?)");
                 return 0;
             }
-            var results = t.GetComponentsInParent(objectType);
+            
+            var includeInactive = false;
+            if (numParameters >= 2) {
+                includeInactive = LuauCore.GetParameterAsBool(1, numParameters, parameterDataPODTypes, parameterDataPtrs, parameterDataSizes, out _);
+            }
+            
+            var results = t.GetComponentsInParent(objectType, includeInactive);
             LuauCore.WritePropertyToThread(thread, results, typeof(Component[]));
             return 1;
         }

package/Runtime/Code/LuauHelper/LuauHelper.cs

@@ -52,7 +52,15 @@ public class LuauHelper : Singleton<LuauHelper> {
     private void SetupUnityAPIClasses() {
         var assemblies = AppDomain.CurrentDomain.GetAssemblies();
         foreach (var assembly in assemblies) {
-            if (!FastStartsWith(assembly.FullName, "Airship") && !FastStartsWith(assembly.FullName, "Easy")) {
+            var validAssembly = false;
+            foreach (var refName in assembly.GetReferencedAssemblies()) {
+                if (refName.Name == "LuauAPI") {
+                    validAssembly = true;
+                    break;
+                }
+            }
+
+            if (!validAssembly) {
                 continue;
             }
 

package/Runtime/Code/Network/Simulation/AirshipNetworkedObject.cs

@@ -78,9 +78,7 @@ namespace Code.Network.Simulation
 
         private void LagCompensationCheck(int clientId, int tick, double time, double latency, double bufferTime)
         {
-            var commandBufferTime = (NetworkServer.sendInterval * (NetworkClient.bufferTimeMultiplier / 2f));
-            
-            var totalBuffer = (latency * 2) + bufferTime + commandBufferTime;
+            var totalBuffer = (latency * 2) + bufferTime;
             var lagCompensatedTime = time - (totalBuffer + bufferAdjustment);
             var lagCompensatedTick = AirshipSimulationManager.Instance.GetNearestTickForUnscaledTime(lagCompensatedTime);
             this.SetSnapshot(lagCompensatedTick);

package/Runtime/Code/Network/Simulation/AirshipSimulationManager.cs

@@ -205,13 +205,7 @@ namespace Code.Network.Simulation
 
             // Only resimulate once. Go back to the farthest back time that was requested.
             if (resimBackTo != tick) this.PerformResimulation(resimBackTo);
-
-            // Perform the standard tick behavior
-            OnTick?.Invoke(tick, time, false);
-            // Debug.Log($"Simulate call. Main tick {tick}");
-            Physics.Simulate(Time.fixedDeltaTime);
-            OnCaptureSnapshot?.Invoke(tick, time, false);
-
+            
             // Process any lag compensation requests now that we have completed the ticking and snapshot creation
             // Note: This process is placed after snapshot processing so that changes made to physics (like an impulse)
             // are processed on the _next_ tick. This is safe because the server never resimulates.
@@ -224,7 +218,7 @@ namespace Code.Network.Simulation
                     // Debug.LogWarning("Server lag compensation rolling back for client " + entry.Key.connectionId);
                     // commandBufferTime is the additional time we queue commands locally on the server before processing them
                     var commandBufferTime = (NetworkServer.sendInterval * (entry.Key.bufferTimeMultiplier / 2f));
-                    OnLagCompensationCheck?.Invoke(entry.Key.connectionId, tick, time, entry.Key.rtt / 2f, entry.Key.bufferTime + commandBufferTime);
+                    OnLagCompensationCheck?.Invoke(entry.Key.connectionId, previousTicks[^1], previousTimes[^1], entry.Key.rtt / 2f, entry.Key.bufferTime + commandBufferTime);
                     
                     var requests = entry.Value;
                     for (var i = 0; i < requests.Count; i++) {
@@ -240,9 +234,10 @@ namespace Code.Network.Simulation
             // If we processed lag compensation, we have some additional work to do
             if (processedLagCompensation)
             {
-                // Debug.LogWarning("Server completed " + this.lagCompensationRequests.Count + " lag compensation requests. Resetting to current tick (" + time + ") and finalizing.");
+                // Debug.LogWarning("Server completed " + this.lagCompensationRequests.Count + " lag compensation requests. Resetting to current tick (" + previousTimes[^1] + ") and finalizing.");
                 // Reset back to the server view of the world at the current time.
-                OnSetSnapshot?.Invoke(tick);
+                OnSetSnapshot?.Invoke(previousTicks[^1]);
+                Physics.SyncTransforms();
                 // Invoke all of the callbacks for modifying physics that should be applied in the next tick.
                 foreach (var entry in this.lagCompensationRequests)
                 {
@@ -261,6 +256,12 @@ namespace Code.Network.Simulation
                 this.lagCompensationRequests.Clear();
             }
 
+            // Perform the standard tick behavior
+            OnTick?.Invoke(tick, time, false);
+            // Debug.Log($"Simulate call. Main tick {tick}");
+            Physics.Simulate(Time.fixedDeltaTime);
+            OnCaptureSnapshot?.Invoke(tick, time, false);
+            
             // Add our completed tick time into our history
             this.previousTicks.Add(tick);
             this.previousTimes.Add(time);

package/Runtime/Code/Network/Simulation/History.cs

@@ -210,7 +210,7 @@ namespace Code.Network.Simulation
          */
         public T[] GetAllAfter(int tick)
         {
-            if (this.history.Keys.Count == 0 || tick > this.history.Keys[^1])
+            if (this.history.Keys.Count == 0 || tick >= this.history.Keys[^1])
             {
                 return new T[] {};
             }
@@ -219,7 +219,7 @@ namespace Code.Network.Simulation
             // Iterate in reverse since our return values will likely include the end
             for (var i = this.history.Count - 1; i >= 0; i--)
             {
-                if (this.history.Keys[i] < tick)
+                if (this.history.Keys[i] <= tick)
                 {
                     after.Reverse();
                     return after.ToArray();
@@ -270,4 +270,4 @@ namespace Code.Network.Simulation
             }
         }
     }
-}
+}

package/Runtime/Code/Network/StateSystem/AirshipNetworkedStateManager.cs

@@ -54,8 +54,10 @@ namespace Code.Network.StateSystem
 
         private double lastServerSend = 0;
 
-        // The local time contained in the last data sent. This is used to know which data we have already sent to the server
+        // The local tick of the most recent data that was sent to the server.
         private int clientLastSentLocalTick = 0;
+        // The local tick of the last data that was sent the the server a second time.
+        private int clientLastResentLocalTick = 0;
 
         // Server processing for commands
         private Input lastProcessedCommand;
@@ -126,10 +128,10 @@ namespace Code.Network.StateSystem
         protected Action<Diff> OnClientReceiveDiff;
         protected Action<int> OnServerReceiveFullSnapshotRequest;
         protected Action<State> OnServerReceiveSnapshot;
-        protected Action<Input> OnServerReceiveInput;
+        protected Action<Input[]> OnServerReceiveInput;
 
         // Functions to be implemented by subclass that perform networking actions
-        public abstract void SendClientInputToServer(Input input);
+        public abstract void SendClientInputToServer(Input[] input);
         public abstract void SendClientSnapshotToServer(State snapshot);
 
         /// <summary>
@@ -253,27 +255,27 @@ namespace Code.Network.StateSystem
                     // We will sometimes resend unconfirmed commands. The server should ignore these if
                     // it has them already.
                     var commands =
-                        this.inputHistory.GetAllAfter((int)Math.Max(0,
-                            (clientLastSentLocalTick - (NetworkClient.sendInterval / Time.fixedUnscaledDeltaTime))));
+                        this.inputHistory.GetAllAfter((int)Math.Max(0,clientLastResentLocalTick)); // Send all inputs that haven't been sent as well as ones that have been sent only once
                     if (commands.Length > 0) {
-                        this.clientLastSentLocalTick = this.inputHistory.Keys[^1];
+                        this.clientLastResentLocalTick = this.clientLastSentLocalTick; // Store the last tick that was resent
+                        this.clientLastSentLocalTick = this.inputHistory.Keys[^1]; // Store which tick was sent
+                        this.SendClientInputToServer(commands);
                     }
                     
                     // print($"Sending {commands.Length} cmds to the server");
 
-                    // We make multiple calls so that Mirror can batch the commands efficiently.
-                    foreach (var command in commands) {
-                        this.SendClientInputToServer(command);
-                    }
+                    // // We make multiple calls so that Mirror can batch the commands efficiently.
+                    // foreach (var command in commands) {
+                    //     this.SendClientInputToServer(command);
+                    // }
                 }
 
                 // We are an authoritative client and should send our latest state
                 if (isClient && isOwned && !serverAuth) {
                     if (this.stateHistory.Keys.Count == 0) return;
-                    var states = this.stateHistory.GetAllAfter((int)Math.Max(0, (this.clientLastSentLocalTick -
-                                                                      (NetworkClient.sendInterval /
-                                                                       Time.fixedUnscaledDeltaTime))));
+                    var states = this.stateHistory.GetAllAfter((int)Math.Max(0, clientLastResentLocalTick));
                     if (states.Length > 0) {
+                        this.clientLastResentLocalTick = this.clientLastSentLocalTick;
                         this.clientLastSentLocalTick = this.stateHistory.Keys[^1];
                     }
 
@@ -1218,9 +1220,13 @@ namespace Code.Network.StateSystem
             this.serverCommandBuffer.Add(command.commandNumber, command);
         }
 
-        private void ServerReceiveInputCommand(Input command)
+        private void ServerReceiveInputCommand(Input[] commands)
         {
-            ProcessClientInputOnServer(command);
+            foreach (var command in commands)
+            {
+                ProcessClientInputOnServer(command);
+            }
+         
         }
 
         private void ServerReceiveSnapshot(State snapshot)