v1.1.1

SEKASIN · Jul 25, 2023 · 0b5ec68 · 0b5ec68
1 parent a64d0b0
commit 0b5ec68
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 26 deletions.
diff --git a/SuperScan/com.github.sekasin.superscan/EventHandler.cs b/SuperScan/com.github.sekasin.superscan/EventHandler.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Exiled.API.Enums;
 using Exiled.API.Features;
@@ -40,33 +41,39 @@ public EventHandler(Plugin<Config> plugin) {
         }
 
         private void Scan() {
-            Cassie.Clear();
-            Cassie.Message(prescan, true, false, true);
             int[] roles = { 0, 0, 0, 0, 0, 0 };
             //SCP, Scientist, FacilityGuard, NTF, ClassD, Chaos
-            foreach (Player player in Player.List) {
-                if (player.IsAlive && !player.IsNPC) {
-                    switch (player.Role.Side) {
-                        case Side.Scp:
-                            roles[0]++;
-                            break;
-                        case Side.Mtf:
-                            if (player.Role.Type == RoleTypeId.Scientist) {
-                                roles[1]++;
-                            } else if (player.Role.Type == RoleTypeId.FacilityGuard) {
-                                roles[2]++;
-                            } else {
-                                roles[3]++;
-                            }
-                            break;
-                        case Side.ChaosInsurgency:
-                            if (player.Role.Type == RoleTypeId.ClassD) {
-                                roles[4]++;
-                            } else {
-                                roles[5]++;
-                            }
-                            break;
-                    }
+            List<Player> alivePlayers = new List<Player>();
+            foreach (Player player in Player.List) { if (player.IsAlive && !player.IsNPC) alivePlayers.Append(player); }
+            if (alivePlayers.Count == 0) {
+                Timing.KillCoroutines(timer);
+                Timing.KillCoroutines(timer2);
+                StartScanTimer();
+                return;
+            }
+            Cassie.Clear();
+            Cassie.Message(prescan, true, false, true);
+            foreach (Player player in alivePlayers) {
+                switch (player.Role.Side) {
+                    case Side.Scp:
+                        roles[0]++;
+                        break;
+                    case Side.Mtf:
+                        if (player.Role.Type == RoleTypeId.Scientist) {
+                            roles[1]++;
+                        } else if (player.Role.Type == RoleTypeId.FacilityGuard) {
+                            roles[2]++;
+                        } else {
+                            roles[3]++;
+                        }
+                        break;
+                    case Side.ChaosInsurgency:
+                        if (player.Role.Type == RoleTypeId.ClassD) {
+                            roles[4]++;
+                        } else {
+                            roles[5]++;
+                        }
+                        break;
                 }
             }
 

diff --git a/SuperScan/com.github.sekasin.superscan/Plugin.cs b/SuperScan/com.github.sekasin.superscan/Plugin.cs
@@ -5,7 +5,7 @@ namespace SuperScan.com.github.sekasin.superscan {
     public class SuperScan : Plugin<Config> {
         public override string Name => "SuperScan";
         public override string Author => "TenDRILLL";
-        public override Version Version => new Version(1, 0, 0);
+        public override Version Version => new Version(1, 1, 1);
         public EventHandler EventHandler;
 
         public override void OnEnabled() {