Preparing for v2.0.0

Author: PiwnicaUwU

UncomplicatedCustomTeams/EventHandlers/SpawnWaves/TeamDependent.cs

@@ -51,7 +51,7 @@ private void TrySpawnDependentTeams(uint triggerTeamId, bool isDeathTrigger)
 
         private void SpawnTeam(Team team)
         {
-            Timing.CallDelayed(team.SpawnConditions.SpawnDelay, () =>
+            CoroutineHandle handle = Timing.CallDelayed(team.SpawnConditions.SpawnDelay, () =>
             {
                 var spawned = TeamSpawner.SpawnSpecificTeam(team);
 
@@ -64,6 +64,7 @@ private void SpawnTeam(Team team)
                     LogManager.Warn($"Dependent Team '{team.Name}' failed to spawn.");
                 }
             });
+            Plugin.Singleton.Handler.ActiveSpawnDelays.Add(handle);
         }
     }
 }

UncomplicatedCustomTeams/EventHandlers/SpawnWaves/UsedItem.cs

@@ -46,14 +46,15 @@ public void OnItemUsed(PlayerUsedItemEventArgs ev)
 
                 LogManager.Debug($"Item '{ev.UsableItem.Type}' matches team '{teamToSpawn.Name}' and passed RNG.");
 
-                Timing.CallDelayed(teamToSpawn.SpawnConditions.SpawnDelay, () =>
+                CoroutineHandle handle = Timing.CallDelayed(teamToSpawn.SpawnConditions.SpawnDelay, () =>
                 {
                     var spawnedTeam = TeamSpawner.SpawnSpecificTeam(teamToSpawn);
                     if (spawnedTeam != null)
                     {
                         LogManager.Debug($"Team with 'UsedItem' Spawn Wave spawned successfully: {teamToSpawn.Name}");
                     }
                 });
+                Plugin.Singleton.Handler.ActiveSpawnDelays.Add(handle);
             }
         }
     }

UncomplicatedCustomTeams/Integrations/ECI.cs

@@ -71,8 +71,7 @@ public static bool IsCustomItem(ushort itemSerial, int id)
 
                 if (customItemInstance == null) return false;
 
-                IEnumerable serials = _trackedSerialsProp.GetValue(customItemInstance) as IEnumerable;
-                if (serials == null) return false;
+                if (_trackedSerialsProp.GetValue(customItemInstance) is not IEnumerable serials) return false;
 
                 foreach (var s in serials)
                 {

UncomplicatedCustomTeams/Resources/DefaultConfig.yml

@@ -147,11 +147,3 @@ teams:
     spawn_settings: 
     custom_flags: 
     ignore_spawn_system: false
-  ecr_roles:
-  - max_players: 1
-    priority: None
-    drop_inventory_on_death: true
-    is_godmode_enabled: false
-    is_bypass_enabled: false
-    is_noclip_enabled: false
-    id: 1

UncomplicatedCustomTeams/Utilities/HttpManager.cs

@@ -48,12 +48,12 @@ internal class HttpManager
     /// <summary>
     /// Gets the CreditTag storage for the plugin, downloaded from our central server
     /// </summary>
-    public Dictionary<string, Triplet<string, string, bool>> Credits { get; internal set; } = new();
+    public Dictionary<string, Triplet<string, string, bool>> Credits { get; internal set; } = [];
 
     /// <summary>
     /// Gets the role of the given player (as steamid@64) inside UCT
     /// </summary>
-    public List<string> IsJobRole { get; } = new();
+    public List<string> IsJobRole { get; } = [];
 
     /// <summary>
     /// Gets the latest <see cref="Version"/> of the plugin, loaded by the UCS cloud
@@ -113,7 +113,7 @@ public void LoadLatestVersion()
 
     public void LoadCreditTags()
     {
-        Credits = new();
+        Credits = [];
         try
         {
             Dictionary<string, Dictionary<string, JsonElement>> Data = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, JsonElement>>>(HttpQuery.Get($"https://api.ucserver.it/credits.json"));