Fix color

edgegamers · Feb 3, 2024 · 88345fd · 88345fd
1 parent f4518b1
commit 88345fd
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/mod/Jailbreak.Rebel/RebelManager.cs b/mod/Jailbreak.Rebel/RebelManager.cs
@@ -16,7 +16,7 @@ public void Start(BasePlugin parent)
     {
         parent.RegisterEventHandler<EventPlayerDisconnect>(OnPlayerDisconnect);
         parent.RegisterEventHandler<EventRoundStart>(OnRoundStart);
-        
+
         parent.AddTimer(1f, () =>
         {
             foreach (var player in GetActiveRebels())
@@ -40,8 +40,11 @@ private HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
         rebelTimes.Clear();
         foreach (var player in Utilities.GetPlayers())
         {
-            ApplyRebelColor(player); 
+            if (!player.IsValid)
+                continue;
+            ApplyRebelColor(player);
         }
+
         return HookResult.Continue;
     }
 
@@ -99,13 +102,10 @@ private void ApplyRebelColor(CCSPlayerController player)
     {
         if (!player.IsValid || player.Pawn.Value == null)
             return;
-        var percentage = GetRebelTimePercentage(player);
-        player.PrintToConsole("Rebel percentage: " + percentage);
-        var inverse = 1 - percentage;
-        var inverseInt = (int)(inverse * 255);
-        var color = Color.FromArgb(254, (int) Math.Round(percentage * 255.0), inverseInt, inverseInt);
+        var percentRGB = (int)Math.Round(GetRebelTimePercentage(player) * 255.0);
+        var color = Color.FromArgb(254, 255, percentRGB, percentRGB);
         player.PrintToConsole("Color: " + color.ToString());
-        if (percentage <= 0)
+        if (percentRGB <= 0)
         {
             color = Color.FromArgb(254, 255, 255, 255);
         }