MAY have fixed T1-T2 kicking.... also reverted GameOptionsMenuPatch.cs changes to 7.2.2 and did some other fixes

Modules/GameOptionsSender/GameOptionsSender.cs

@@ -119,32 +119,38 @@ public abstract class GameOptionsSender
 
     public static IEnumerator SendDirtyGameOptionsContinuously()
     {
-        while (GameStates.InGame || GameStates.IsLobby)
+        try
         {
-            for (var index = 0; index < AllSenders.Count; index++)
+            while (GameStates.InGame || GameStates.IsLobby)
             {
-                GameOptionsSender sender = AllSenders[index];
-
-                yield return WaitFrameIfNecessary();
-
-                if (sender == null || !sender.AmValid())
+                for (var index = 0; index < AllSenders.Count; index++)
                 {
-                    AllSenders.RemoveAt(index);
-                    index--;
-                    continue;
+                    yield return WaitFrameIfNecessary();
+                    
+                    if (index >= AllSenders.Count) break;
+                    GameOptionsSender sender = AllSenders[index];
+
+                    if (sender == null || !sender.AmValid())
+                    {
+                        AllSenders.RemoveAt(index);
+                        index--;
+                        continue;
+                    }
+
+                    if (sender.IsDirty)
+                        yield return sender.SendGameOptionsAsync();
+
+                    sender.IsDirty = false;
                 }
 
-                if (sender.IsDirty)
-                    yield return sender.SendGameOptionsAsync();
-
-                sender.IsDirty = false;
+                ForceWaitFrame = true;
+                yield return WaitFrameIfNecessary();
             }
-
-            ForceWaitFrame = true;
-            yield return WaitFrameIfNecessary();
         }
-
-        ActiveCoroutine = null;
+        finally
+        {
+            ActiveCoroutine = null;
+        }
     }
 
     protected static IEnumerator WaitFrameIfNecessary()

Modules/GameOptionsSender/PlayerGameOptionsSender.cs

@@ -687,7 +687,7 @@ public sealed class PlayerGameOptionsSender(PlayerControl player) : GameOptionsS
 
     protected override bool AmValid()
     {
-        return base.AmValid() && player != null && player.Data != null && !player.Data.Disconnected && Main.RealOptionsData != null;
+        return base.AmValid() && player && player.Data && !player.Data.Disconnected && Main.RealOptionsData != null;
     }
 
 }