From 4a62f96debb1150556226155d09b7873cc8a1eeb Mon Sep 17 00:00:00 2001
From: Yamato <louismonneyron5@yahoo.com>
Date: Sat, 7 Dec 2024 01:16:19 +0100
Subject: [PATCH 1/6] IDK why don't work

---
 .../EventArgs/Server/EndingRoundEventArgs.cs  | 27 ++-------
 .../Patches/Events/Server/RoundEnd.cs         | 58 ++++++++++---------
 2 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs
index bbdce5c087..2d5f14fa80 100644
--- a/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs
@@ -21,16 +21,19 @@ public class EndingRoundEventArgs : IDeniableEvent
         /// <param name="classList">
         /// <inheritdoc cref="RoundSummary.SumInfo_ClassList" />
         /// </param>
+        /// <param name="leadingTeam">
+        /// <inheritdoc cref="LeadingTeam" />
+        /// </param>
         /// <param name="isForceEnded">
         /// <inheritdoc cref="IsForceEnded" />
         /// </param>
         /// <param name="isAllowed">
         /// <inheritdoc cref="IsAllowed" />
         /// </param>
-        public EndingRoundEventArgs(RoundSummary.SumInfo_ClassList classList, bool isForceEnded, bool isAllowed)
+        public EndingRoundEventArgs(RoundSummary.SumInfo_ClassList classList, LeadingTeam leadingTeam, bool isForceEnded, bool isAllowed)
         {
             ClassList = classList;
-            LeadingTeam = GetLeadingTeam(classList);
+            LeadingTeam = leadingTeam;
             IsForceEnded = isForceEnded;
             IsAllowed = isAllowed;
         }
@@ -54,25 +57,5 @@ public EndingRoundEventArgs(RoundSummary.SumInfo_ClassList classList, bool isFor
         /// Gets or sets a value indicating whether the round is going to finish or not.
         /// </summary>
         public bool IsAllowed { get; set; }
-
-        private LeadingTeam GetLeadingTeam(RoundSummary.SumInfo_ClassList classList)
-        {
-            // NW logic
-            int facilityForces = classList.mtf_and_guards + classList.scientists;
-            int chaosInsurgency = classList.chaos_insurgents + classList.class_ds;
-            int anomalies = classList.scps_except_zombies + classList.zombies;
-            int num4 = facilityForces > 0 ? 1 : 0;
-            bool flag1 = chaosInsurgency > 0;
-            bool flag2 = anomalies > 0;
-            RoundSummary.LeadingTeam leadingTeam = RoundSummary.LeadingTeam.Draw;
-            if (num4 != 0)
-                leadingTeam = RoundSummary.EscapedScientists >= RoundSummary.EscapedClassD ? RoundSummary.LeadingTeam.FacilityForces : RoundSummary.LeadingTeam.Draw;
-            else if (flag2 || flag2 & flag1)
-                leadingTeam = RoundSummary.EscapedClassD > RoundSummary.SurvivingSCPs ? RoundSummary.LeadingTeam.ChaosInsurgency : (RoundSummary.SurvivingSCPs > RoundSummary.EscapedScientists ? RoundSummary.LeadingTeam.Anomalies : RoundSummary.LeadingTeam.Draw);
-            else if (flag1)
-                leadingTeam = RoundSummary.EscapedClassD >= RoundSummary.EscapedScientists ? RoundSummary.LeadingTeam.ChaosInsurgency : RoundSummary.LeadingTeam.Draw;
-
-            return (LeadingTeam)leadingTeam;
-        }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
index 489e015a19..a5038f20b0 100644
--- a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
@@ -70,6 +70,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldloc_S, 11),
                     new(OpCodes.Call, Method(typeof(HashSet<ReferenceHub>), nameof(HashSet<ReferenceHub>.Contains))),
                     new(OpCodes.Brtrue_S, jmp),
+                    new(OpCodes.Pop),
+                    new(OpCodes.Stfld, Field(PrivateType, LeadingTeam)),
+                    new(OpCodes.Stfld, Field(PrivateType, LeadingTeam)),
                 });
 
             offset = 4;
@@ -77,18 +80,39 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             newInstructions[index].labels.Add(jmp);
 
+            // Get the whole leadingteam logic
+            offset = -2;
+            index = newInstructions.FindIndex(x => x.StoresField(Field(PrivateType, LeadingTeam))) + offset;
+            int offset2 = 1;
+            int index2 = newInstructions.FindLastIndex(x => x.StoresField(Field(PrivateType, LeadingTeam))) + offset2;
+            Log.Error($"Index A {index} Index B {index2} opcode a suprimé {index2 - index}");
+            List<CodeInstruction> leadingTeamLogic = newInstructions.GetRange(index, index2 - index);
+            List<Label> moveLabel = newInstructions[index2 + 1].ExtractLabels();
+            newInstructions.RemoveRange(index, index2 - index);
+
+            // put the LeadingTeam logic before the event
+            offset = -1;
+            index = newInstructions.FindIndex(x => x.LoadsField(Field(typeof(RoundSummary), nameof(RoundSummary._roundEnded)))) + offset;
+            Log.Error($"Index {index}");
+            newInstructions.InsertRange(index, leadingTeamLogic);
+
+            // recorect the index because of the LeadingTeamLogic that got moved
             offset = -1;
             index = newInstructions.FindIndex(x => x.LoadsField(Field(typeof(RoundSummary), nameof(RoundSummary._roundEnded)))) + offset;
             LocalBuilder evEndingRound = generator.DeclareLocal(typeof(EndingRoundEventArgs));
 
             newInstructions.InsertRange(
                 index,
-                new[]
+                new CodeInstruction[]
                 {
                     // this.newList
-                    new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
+                    new CodeInstruction(OpCodes.Ldarg_0).WithLabels(moveLabel),
                     new(OpCodes.Ldfld, Field(PrivateType, NewList)),
 
+                    // this.LeadingTeam
+                    new(OpCodes.Ldarg_0),
+                    new(OpCodes.Ldfld, Field(PrivateType, LeadingTeam)),
+
                     // isForceEnd
                     new(OpCodes.Ldloc_1),
                     new(OpCodes.Ldfld, Field(typeof(RoundSummary), nameof(RoundSummary._roundEnded))),
@@ -114,35 +138,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldloc_S, evEndingRound.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(EndingRoundEventArgs), nameof(EndingRoundEventArgs.IsAllowed))),
                     new(OpCodes.Stloc_S, 5),
-                });
-
-            // Replace NW logic to LeadingTeam leadingTeam = ev.LeadingTeam
-            offset = 2;
-            index = newInstructions.FindLastIndex(x => x.LoadsField(Field(typeof(RoundSummary), nameof(RoundSummary._roundEnded)))) + offset;
-            int offset2 = 1;
-            int index2 = newInstructions.FindLastIndex(x => x.opcode == OpCodes.Stloc_S && x.operand is LocalBuilder { LocalIndex: 7 }) + offset2;
-
-            newInstructions.RemoveRange(index, index2 - index);
 
-            offset = -1;
-            index = newInstructions.FindIndex(x => x.StoresField(Field(PrivateType, LeadingTeam))) + offset;
-
-            newInstructions.RemoveAt(index);
-            newInstructions.InsertRange(
-                index,
-                new CodeInstruction[]
-                {
+                    // this.LeadingTeam = ev.LeadingTeam
+                    new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldloc_S, evEndingRound.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(EndingRoundEventArgs), nameof(EndingRoundEventArgs.LeadingTeam))),
+                    new(OpCodes.Stfld, Field(PrivateType, LeadingTeam)),
                 });
 
-            offset = 1;
-            index = newInstructions.FindIndex(x => x.StoresField(Field(PrivateType, LeadingTeam))) + offset;
-            offset2 = 1;
-            index2 = newInstructions.FindLastIndex(x => x.StoresField(Field(PrivateType, LeadingTeam))) + offset2;
-
-            newInstructions.RemoveRange(index, index2 - index);
-
             // Round.LastClassList = this.newList;
             offset = 1;
             index = newInstructions.FindIndex(x => x.opcode == OpCodes.Stfld && x.operand == (object)Field(typeof(SumInfo_ClassList), nameof(SumInfo_ClassList.warhead_kills))) + offset;
@@ -195,6 +198,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             index = newInstructions.FindLastIndex(x => x.opcode == OpCodes.Call && x.operand == (object)Method(typeof(RoundSummary), nameof(RoundSummary.RpcShowRoundSummary))) + offset;
             newInstructions[index].labels.Add(skip);
 
+            for (int z = 0; z < newInstructions.Count; z++)
+                Log.Warn($"[{z}] {newInstructions[z].opcode} : {(newInstructions[z].operand is Label label ? $"Line: {newInstructions.FindIndex(x => x.labels.Contains(label))}" : $"{newInstructions[z].operand}")} {newInstructions[z].labels.Count}");
+
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
 

From 6e920b5dd414c7f2a88ed7cd48bb6b09bbf45801 Mon Sep 17 00:00:00 2001
From: Yamato <louismonneyron5@yahoo.com>
Date: Sat, 7 Dec 2024 01:20:33 +0100
Subject: [PATCH 2/6] fix offset

---
 EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
index a5038f20b0..6ad70fb63a 100644
--- a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
@@ -70,9 +70,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldloc_S, 11),
                     new(OpCodes.Call, Method(typeof(HashSet<ReferenceHub>), nameof(HashSet<ReferenceHub>.Contains))),
                     new(OpCodes.Brtrue_S, jmp),
-                    new(OpCodes.Pop),
-                    new(OpCodes.Stfld, Field(PrivateType, LeadingTeam)),
-                    new(OpCodes.Stfld, Field(PrivateType, LeadingTeam)),
                 });
 
             offset = 4;
@@ -81,7 +78,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             newInstructions[index].labels.Add(jmp);
 
             // Get the whole leadingteam logic
-            offset = -2;
+            offset = -16;
             index = newInstructions.FindIndex(x => x.StoresField(Field(PrivateType, LeadingTeam))) + offset;
             int offset2 = 1;
             int index2 = newInstructions.FindLastIndex(x => x.StoresField(Field(PrivateType, LeadingTeam))) + offset2;

From 941923c573072740201221d53b520f86a342d8d2 Mon Sep 17 00:00:00 2001
From: Yamato <louismonneyron5@yahoo.com>
Date: Sat, 7 Dec 2024 01:20:58 +0100
Subject: [PATCH 3/6] RemoveDebug

---
 EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
index 6ad70fb63a..d77fda3838 100644
--- a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
@@ -82,7 +82,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             index = newInstructions.FindIndex(x => x.StoresField(Field(PrivateType, LeadingTeam))) + offset;
             int offset2 = 1;
             int index2 = newInstructions.FindLastIndex(x => x.StoresField(Field(PrivateType, LeadingTeam))) + offset2;
-            Log.Error($"Index A {index} Index B {index2} opcode a suprimé {index2 - index}");
             List<CodeInstruction> leadingTeamLogic = newInstructions.GetRange(index, index2 - index);
             List<Label> moveLabel = newInstructions[index2 + 1].ExtractLabels();
             newInstructions.RemoveRange(index, index2 - index);
@@ -90,7 +89,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             // put the LeadingTeam logic before the event
             offset = -1;
             index = newInstructions.FindIndex(x => x.LoadsField(Field(typeof(RoundSummary), nameof(RoundSummary._roundEnded)))) + offset;
-            Log.Error($"Index {index}");
             newInstructions.InsertRange(index, leadingTeamLogic);
 
             // recorect the index because of the LeadingTeamLogic that got moved
@@ -195,9 +193,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             index = newInstructions.FindLastIndex(x => x.opcode == OpCodes.Call && x.operand == (object)Method(typeof(RoundSummary), nameof(RoundSummary.RpcShowRoundSummary))) + offset;
             newInstructions[index].labels.Add(skip);
 
-            for (int z = 0; z < newInstructions.Count; z++)
-                Log.Warn($"[{z}] {newInstructions[z].opcode} : {(newInstructions[z].operand is Label label ? $"Line: {newInstructions.FindIndex(x => x.labels.Contains(label))}" : $"{newInstructions[z].operand}")} {newInstructions[z].labels.Count}");
-
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
 

From add56ef99c7f4b78c6818d59587b70f297d717a2 Mon Sep 17 00:00:00 2001
From: Yamato <louismonneyron5@yahoo.com>
Date: Sat, 7 Dec 2024 01:23:54 +0100
Subject: [PATCH 4/6] little change

---
 .../EventArgs/Server/EndingRoundEventArgs.cs           | 10 +++++-----
 EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs
index 2d5f14fa80..216676772b 100644
--- a/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs
@@ -18,22 +18,22 @@ public class EndingRoundEventArgs : IDeniableEvent
         /// <summary>
         /// Initializes a new instance of the <see cref="EndingRoundEventArgs" /> class.
         /// </summary>
-        /// <param name="classList">
-        /// <inheritdoc cref="RoundSummary.SumInfo_ClassList" />
-        /// </param>
         /// <param name="leadingTeam">
         /// <inheritdoc cref="LeadingTeam" />
         /// </param>
+        /// <param name="classList">
+        /// <inheritdoc cref="RoundSummary.SumInfo_ClassList" />
+        /// </param>
         /// <param name="isForceEnded">
         /// <inheritdoc cref="IsForceEnded" />
         /// </param>
         /// <param name="isAllowed">
         /// <inheritdoc cref="IsAllowed" />
         /// </param>
-        public EndingRoundEventArgs(RoundSummary.SumInfo_ClassList classList, LeadingTeam leadingTeam, bool isForceEnded, bool isAllowed)
+        public EndingRoundEventArgs(LeadingTeam leadingTeam, RoundSummary.SumInfo_ClassList classList, bool isForceEnded, bool isAllowed)
         {
-            ClassList = classList;
             LeadingTeam = leadingTeam;
+            ClassList = classList;
             IsForceEnded = isForceEnded;
             IsAllowed = isAllowed;
         }
diff --git a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
index d77fda3838..1d83aaf5ee 100644
--- a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
@@ -100,14 +100,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new CodeInstruction[]
                 {
-                    // this.newList
-                    new CodeInstruction(OpCodes.Ldarg_0).WithLabels(moveLabel),
-                    new(OpCodes.Ldfld, Field(PrivateType, NewList)),
-
                     // this.LeadingTeam
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldfld, Field(PrivateType, LeadingTeam)),
 
+                    // this.newList
+                    new CodeInstruction(OpCodes.Ldarg_0).WithLabels(moveLabel),
+                    new(OpCodes.Ldfld, Field(PrivateType, NewList)),
+
                     // isForceEnd
                     new(OpCodes.Ldloc_1),
                     new(OpCodes.Ldfld, Field(typeof(RoundSummary), nameof(RoundSummary._roundEnded))),

From 4b43bbf619a42adf15209010df18ab03598cda29 Mon Sep 17 00:00:00 2001
From: Yamato <louismonneyron5@yahoo.com>
Date: Sat, 7 Dec 2024 01:47:02 +0100
Subject: [PATCH 5/6] Oups

---
 EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
index 1d83aaf5ee..5d60d2d608 100644
--- a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
@@ -101,11 +101,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new CodeInstruction[]
                 {
                     // this.LeadingTeam
-                    new(OpCodes.Ldarg_0),
+                    new CodeInstruction(OpCodes.Ldarg_0).WithLabels(moveLabel),
                     new(OpCodes.Ldfld, Field(PrivateType, LeadingTeam)),
 
                     // this.newList
-                    new CodeInstruction(OpCodes.Ldarg_0).WithLabels(moveLabel),
+                    new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldfld, Field(PrivateType, NewList)),
 
                     // isForceEnd

From 748d066c1cce52ed41e23e0512d2425472143693 Mon Sep 17 00:00:00 2001
From: Yamato <louismonneyron5@yahoo.com>
Date: Sat, 7 Dec 2024 02:09:22 +0100
Subject: [PATCH 6/6] fix

---
 EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
index 5d60d2d608..1b781fbd9c 100644
--- a/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs
@@ -83,7 +83,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             int offset2 = 1;
             int index2 = newInstructions.FindLastIndex(x => x.StoresField(Field(PrivateType, LeadingTeam))) + offset2;
             List<CodeInstruction> leadingTeamLogic = newInstructions.GetRange(index, index2 - index);
-            List<Label> moveLabel = newInstructions[index2 + 1].ExtractLabels();
+            List<Label> moveLabel = newInstructions[index2].ExtractLabels();
             newInstructions.RemoveRange(index, index2 - index);
 
             // put the LeadingTeam logic before the event