From fcc3a9a63c7dfc8ffdc416a79aad1ec5f3a4feb4 Mon Sep 17 00:00:00 2001 From: Aristeas <94058548+ari-steas@users.noreply.github.com> Date: Thu, 6 Feb 2025 21:34:58 -0600 Subject: [PATCH 1/3] Fix KOTH win condition display From 32b1896c73c54fa2027ddabd6e2d54fadde2e82f Mon Sep 17 00:00:00 2001 From: Aristeas <94058548+ari-steas@users.noreply.github.com> Date: Thu, 6 Feb 2025 21:42:51 -0600 Subject: [PATCH 2/3] inexplicable --- .../SUGMA/GameModes/Elimination/EliminationGamemode.cs | 5 ++--- .../Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationGamemode.cs b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationGamemode.cs index e58604d45..c7034ba57 100644 --- a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationGamemode.cs +++ b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationGamemode.cs @@ -182,10 +182,9 @@ public override void StartRound(string[] arguments = null) "\n- Tracked grids:" + trackedGrids); } - protected bool _setWinnerFromArgs = false; public override void StopRound() { - _setWinnerFromArgs = false; + bool setWinnerFromArgs = false; foreach (var arg in Arguments) { if (arg.StartsWith("win")) @@ -200,7 +199,7 @@ public override void StopRound() } } - if (!_setWinnerFromArgs && MyAPIGateway.Session.IsServer) + if (!setWinnerFromArgs && MyAPIGateway.Session.IsServer) { Arguments = Arguments.Concat(new[] { $"win{_winningFaction?.FactionId ?? -1}" }).ToArray(); } diff --git a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs index 1ef5a9c00..274dd7ffd 100644 --- a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs +++ b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs @@ -60,8 +60,6 @@ public override void StopRound() { _winningFaction = ControlPoint._zoneOwner; base.StopRound(); - if (!_setWinnerFromArgs) - _winningFaction = ControlPoint._zoneOwner; SUGMA_SessionComponent.I.GetComponent("KOTHHud")?.MatchEnded(_winningFaction); SUGMA_SessionComponent.I.UnregisterComponent("KOTHHud"); From 06e71342db414adcc2aafad69049a97270367d62 Mon Sep 17 00:00:00 2001 From: Aristeas <94058548+ari-steas@users.noreply.github.com> Date: Thu, 6 Feb 2025 21:43:31 -0600 Subject: [PATCH 3/3] Update SUtils.cs --- .../Data/Scripts/SUGMA/Utilities/SUtils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/Utilities/SUtils.cs b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/Utilities/SUtils.cs index d1dc25512..525c171a9 100644 --- a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/Utilities/SUtils.cs +++ b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/Utilities/SUtils.cs @@ -49,7 +49,7 @@ public static void SetWorldPermissionsForMatch(bool matchActive) MySessionComponentSafeZones.AllowedActions = CastProhibit(MySessionComponentSafeZones.AllowedActions, matchActive ? MatchPermsInt : FullPermsInt); - if (matchActive && MyAPIGateway.Session.IsServer) + if (matchActive && (MyAPIGateway.Session?.IsServer ?? false)) ClearImageLcds(); }