Respawing team event fix (#1758)

* fix * Another logic * Another logic * Delete RespawningTeam.cs * again * and again * done * some fixes * finally * remove useless --------- Co-authored-by: joker-119 <[email protected]>
Exiled-Team · May 10, 2023 · c806799 · c806799
1 parent 386e511
commit c806799
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/Exiled.Events/EventArgs/Server/RespawningTeamEventArgs.cs b/Exiled.Events/EventArgs/Server/RespawningTeamEventArgs.cs
@@ -23,6 +23,7 @@ namespace Exiled.Events.EventArgs.Server
     public class RespawningTeamEventArgs : IDeniableEvent
     {
         private SpawnableTeamType nextKnownTeam;
+        private int maximumRespawnAmount;
 
         /// <summary>
         ///     Initializes a new instance of the <see cref="RespawningTeamEventArgs" /> class.
@@ -58,7 +59,19 @@ public RespawningTeamEventArgs(List<Player> players, int maxRespawn, SpawnableTe
         /// <summary>
         ///     Gets or sets the maximum amount of respawnable players.
         /// </summary>
-        public int MaximumRespawnAmount { get; set; }
+        public int MaximumRespawnAmount
+        {
+            get => maximumRespawnAmount;
+            set
+            {
+                if (value < maximumRespawnAmount)
+                {
+                    Players.RemoveRange(value, Players.Count - value);
+                }
+
+                maximumRespawnAmount = value;
+            }
+        }
 
         /// <summary>
         ///     Gets or sets a value indicating what the next respawnable team is.
@@ -98,4 +111,4 @@ public SpawnableTeamHandlerBase SpawnableTeam
         /// </summary>
         public Queue<RoleTypeId> SpawnQueue { get; set; }
     }
-}
+}
diff --git a/Exiled.Events/Patches/Events/Server/RespawningTeam.cs b/Exiled.Events/Patches/Events/Server/RespawningTeam.cs
@@ -13,13 +13,11 @@ namespace Exiled.Events.Patches.Events.Server
     using System.Reflection.Emit;
 
     using API.Features.Pools;
-
     using Exiled.Events.EventArgs.Server;
     using Exiled.Events.Handlers;
-
     using HarmonyLib;
-
     using Respawning;
+    using Respawning.NamingRules;
 
     using static HarmonyLib.AccessTools;
 
@@ -36,8 +34,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            int offset = -2;
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Stloc_3) + offset;
+            int offset = -3;
+            int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(UnitNamingRule), nameof(UnitNamingRule.TryGetNamingRule)))) + offset;
 
             LocalBuilder ev = generator.DeclareLocal(typeof(RespawningTeamEventArgs));
 
@@ -101,7 +99,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Call, Method(typeof(RespawningTeam), nameof(GetHubs))),
                     new(OpCodes.Stloc_1),
 
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(RespawningTeamEventArgs), nameof(RespawningTeamEventArgs.SpawnQueue))),
+                    // queueToFill = ev.SpawnQueue;
+                    new CodeInstruction(OpCodes.Callvirt, PropertyGetter(typeof(RespawningTeamEventArgs), nameof(RespawningTeamEventArgs.SpawnQueue))),
                     new(OpCodes.Stloc, 6),
                 });