Merge pull request #1387 from EnhancedNetwork/FixModdedClientsNotRese…

…tKillCooldownAfterMeeting Fix Modded Clients Always Play Shield Animation When "Disable Shield Animations" Is off
EnhancedNetwork · Jan 23, 2025 · 89cee97 · 89cee97
2 parents 90e885a + 28352a7
commit 89cee97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Modules/AntiBlackout.cs b/Modules/AntiBlackout.cs
@@ -301,11 +301,12 @@ private static void ResetAllCooldown()
         {
             if (seer.IsAlive())
             {
-                seer.RpcResetAbilityCooldown();
                 seer.ResetKillCooldown();
 
                 if (Main.AllPlayerKillCooldown.TryGetValue(seer.PlayerId, out var kcd))
-                    seer.SetKillCooldown(kcd + 1f);
+                    seer.SetKillCooldown(kcd >= 2f ? kcd - 2f : kcd);
+
+                seer.RpcResetAbilityCooldown();
             }
             else if (seer.HasGhostRole())
             {

diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs
@@ -526,7 +526,7 @@ public static void SetKillCooldown(this PlayerControl player, float time = -1f,
                 gc.KCDTimer = (int)(time / 2);
             }
         }
-        else if (forceAnime || !player.IsModded() || !Options.DisableShieldAnimations.GetBool())
+        else if (forceAnime || !player.IsModded())
         {
             player.SyncSettings();
             player.RpcGuardAndKill(target, fromSetKCD: true);
@@ -568,7 +568,7 @@ public static void SetKillCooldownV3(this PlayerControl player, float time = -1f
         if (target == null) target = player;
         if (time >= 0f) Main.AllPlayerKillCooldown[player.PlayerId] = time * 2;
         else Main.AllPlayerKillCooldown[player.PlayerId] *= 2;
-        if (forceAnime || !player.IsModded() || !Options.DisableShieldAnimations.GetBool())
+        if (forceAnime || !player.IsModded())
         {
             player.SyncSettings();
             player.RpcGuardAndKill(target, fromSetKCD: true);