Ending round event fix (Exiled-Team#2280)

Co-authored-by: Yamato <[email protected]>
Misaka-ZeroTwo · Nov 20, 2023 · d17e1d4 · d17e1d4
1 parent cdc5e51
commit d17e1d4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs b/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs
@@ -29,11 +29,15 @@ public class EndingRoundEventArgs : IDeniableEvent
         /// <param name="isAllowed">
         ///     <inheritdoc cref="IsRoundEnded" />
         /// </param>
-        public EndingRoundEventArgs(RoundSummary.LeadingTeam leadingTeam, RoundSummary.SumInfo_ClassList classList, bool isAllowed)
+        /// <param name="isForceEnded">
+        ///     <inheritdoc cref="IsForceEnded" />
+        /// </param>
+        public EndingRoundEventArgs(RoundSummary.LeadingTeam leadingTeam, RoundSummary.SumInfo_ClassList classList, bool isAllowed, bool isForceEnded)
         {
             ClassList = classList;
             LeadingTeam = (LeadingTeam)leadingTeam;
             IsRoundEnded = isAllowed;
+            IsForceEnded = isForceEnded;
         }
 
         /// <summary>
@@ -51,6 +55,11 @@ public EndingRoundEventArgs(RoundSummary.LeadingTeam leadingTeam, RoundSummary.S
         /// </summary>
         public bool IsRoundEnded { get; set; } // TODO: Obsolete this in Exiled 10
 
+        /// <summary>
+        ///     Gets or Sets a value indicating whether the round is ended by API call.
+        /// </summary>
+        public bool IsForceEnded { get; set; }
+
         /// <summary>
         ///     Gets or sets a value indicating whether the event can be executed or not.
         /// </summary>

diff --git a/Exiled.Events/Patches/Events/Server/RoundEnd.cs b/Exiled.Events/Patches/Events/Server/RoundEnd.cs
@@ -80,7 +80,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     // shouldRoundEnd
                     new(OpCodes.Ldloc_S, 4),
 
-                    // EndingRoundEventArgs evEndingRound = new(RoundSummary.LeadingTeam, RoundSummary.SumInfo_ClassList, bool);
+                    // isForceEnd
+                    new(OpCodes.Ldloc_1),
+                    new(OpCodes.Ldfld, Field(typeof(RoundSummary), nameof(RoundSummary._roundEnded))),
+
+                    // EndingRoundEventArgs evEndingRound = new(RoundSummary.LeadingTeam, RoundSummary.SumInfo_ClassList, bool, bool);
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(EndingRoundEventArgs))[0]),
                     new(OpCodes.Dup),
 
@@ -94,11 +98,16 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Callvirt, PropertyGetter(typeof(EndingRoundEventArgs), nameof(EndingRoundEventArgs.LeadingTeam))),
                     new(OpCodes.Stfld, Field(PrivateType, LeadingTeam)),
 
-                    // this._roundEnded = ev.IsAllowed
+                    // this._roundEnded = ev.IsForceEnded
                     new(OpCodes.Ldloc_1),
                     new(OpCodes.Ldloc_S, evEndingRound.LocalIndex),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(EndingRoundEventArgs), nameof(EndingRoundEventArgs.IsAllowed))),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(EndingRoundEventArgs), nameof(EndingRoundEventArgs.IsForceEnded))),
                     new(OpCodes.Stfld, Field(typeof(RoundSummary), nameof(RoundSummary._roundEnded))),
+
+                    // flag = ev.IsAllowed
+                    new(OpCodes.Ldloc_S, evEndingRound.LocalIndex),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(EndingRoundEventArgs), nameof(EndingRoundEventArgs.IsAllowed))),
+                    new(OpCodes.Stloc_S, 4),
                 });
 
             offset = 7;