From d16f598828e8e24b40506cd7a4a5625d509c8277 Mon Sep 17 00:00:00 2001
From: metalgearsloth <comedian_vs_clown@hotmail.com>
Date: Fri, 18 Sep 2026 20:42:12 +1000
Subject: [PATCH] Rollback LastModifiedTick before component state handling.

---
 Robust.Client/GameStates/ClientGameStateManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Robust.Client/GameStates/ClientGameStateManager.cs b/Robust.Client/GameStates/ClientGameStateManager.cs
index 07124b788e4..7d79f0a1641 100644
--- a/Robust.Client/GameStates/ClientGameStateManager.cs
+++ b/Robust.Client/GameStates/ClientGameStateManager.cs
@@ -1585,6 +1585,8 @@ private void HandleEntityState(in StateData data, IEventBus bus, GameTick toTick
                     else if (compChange.LastModifiedTick <= data.LastApplied && data.LastApplied != GameTick.Zero)
                         continue;
 
+                    // Reset it to server state in case something dirtied it in the meantime.
+                    comp.LastModifiedTick = compChange.LastModifiedTick;
                     _compStateWork[compChange.NetID] = (comp, compChange.State, null);
                 }
             }