also bypass manual interpolation if ship's m_dead is true

overload-development-community · Aug 8, 2021 · 4ffb0b3 · 4ffb0b3
1 parent e0f2a42
commit 4ffb0b3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/GameMod/MPErrorSmoothingFix.cs b/GameMod/MPErrorSmoothingFix.cs
@@ -112,8 +112,8 @@ class MPErrorSmoothingFix_UpdateCycle
         {
             static void Prefix()
             {
-                // only on the Client, in Multiplayer, in an active game, not during death roll:
-                if (!Server.IsActive() && GameplayManager.IsMultiplayerActive && NetworkMatch.InGameplay() && !GameManager.m_local_player.c_player_ship.m_dying && !MPObserver.Enabled)
+                // only on the Client, in Multiplayer, in an active game, not during death or death roll:
+                if (!Server.IsActive() && GameplayManager.IsMultiplayerActive && NetworkMatch.InGameplay() && !GameManager.m_local_player.c_player_ship.m_dying && !GameManager.m_local_player.c_player_ship.m_dead && !MPObserver.Enabled)
                 {
                     // undo potential override also before FixedUpdate
                     undoTransformOverride();
@@ -122,11 +122,11 @@ static void Prefix()
 
             static void Postfix()
             {
-                // only on the Client, in Multiplayer, in an active game, not during death roll:
+                // only on the Client, in Multiplayer, in an active game, not during death or death roll:
                 if (MPObserver.Enabled)
                     return;
 
-                if (!Server.IsActive() && GameplayManager.IsMultiplayerActive && NetworkMatch.InGameplay() && !GameManager.m_local_player.c_player_ship.m_dying)
+                if (!Server.IsActive() && GameplayManager.IsMultiplayerActive && NetworkMatch.InGameplay() && !GameManager.m_local_player.c_player_ship.m_dying && !GameManager.m_local_player.c_player_ship.m_dead)
                 {
                     if (!doManualInterpolation)
                     {