fix: KeybindSetting and RoundEnd transpiler

EXILED/Exiled.API/Features/Core/UserSettings/KeybindSetting.cs

@@ -18,6 +18,23 @@ namespace Exiled.API.Features.Core.UserSettings
     /// </summary>
     public class KeybindSetting : SettingBase, IWrapper<SSKeybindSetting>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="KeybindSetting"/> class.
+        /// </summary>
+        /// <param name="id"><inheritdoc cref="SettingBase.Id"/></param>
+        /// <param name="label"><inheritdoc cref="SettingBase.Label"/></param>
+        /// <param name="suggested"><inheritdoc cref="KeyCode"/></param>
+        /// <param name="preventInteractionOnGUI"><inheritdoc cref="PreventInteractionOnGUI"/></param>
+        /// <param name="hintDescription"><inheritdoc cref="SettingBase.HintDescription"/></param>
+        /// <param name="header"><inheritdoc cref="SettingBase.Header"/></param>
+        /// <param name="onChanged"><inheritdoc cref="SettingBase.OnChanged"/></param>
+        [Obsolete("This method will be removed next major version because of a new feature. Use the constructor with \"allowSpectator\" instead.")]
+        public KeybindSetting(int id, string label, KeyCode suggested, bool preventInteractionOnGUI, string hintDescription, HeaderSetting header, Action<Player, SettingBase> onChanged)
+            : base(new SSKeybindSetting(id, label, suggested, preventInteractionOnGUI, false, hintDescription), header, onChanged)
+        {
+            Base = (SSKeybindSetting)base.Base;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="KeybindSetting"/> class.
         /// </summary>

EXILED/Exiled.API/Features/Player.cs

@@ -1163,11 +1163,6 @@ public bool IsSpawnProtected
         /// </summary>
         protected HealthStat CustomHealthStat { get; set; }
 
-        /// <summary>
-        /// Gets or sets a <see cref="ScaleController"/>.
-        /// </summary>
-        protected FpcScaleController ScaleController { get; set; }
-
         /// <summary>
         /// Converts LabApi player to EXILED player.
         /// </summary>
@@ -2077,7 +2072,7 @@ public void SetScale(Vector3 scale, IEnumerable<Player> viewers)
 
             try
             {
-                ScaleController.Scale = scale;
+                ReferenceHub.transform.localScale = scale;
 
                 foreach (Player target in viewers)
                     Server.SendSpawnMessage?.Invoke(null, new object[] { NetworkIdentity, target.Connection });
@@ -2099,12 +2094,12 @@ public void SetFakeScale(Vector3 fakeScale, IEnumerable<Player> viewers)
 
             try
             {
-                ScaleController.Scale = fakeScale;
+                ReferenceHub.transform.localScale = fakeScale;
 
                 foreach (Player target in viewers)
                     Server.SendSpawnMessage.Invoke(null, new object[] { NetworkIdentity, target.Connection });
 
-                ScaleController.Scale = currentScale;
+                ReferenceHub.transform.localScale = currentScale;
             }
             catch (Exception ex)
             {

EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs

@@ -66,8 +66,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new CodeInstruction[]
                 {
                     new(OpCodes.Call, PropertyGetter(typeof(Round), nameof(Round.IgnoredPlayers))),
-                    new(OpCodes.Ldloc_S, 19),
-                    new(OpCodes.Call, Method(typeof(HashSet<ReferenceHub>), nameof(HashSet<ReferenceHub>.Contains))),
+                    new(OpCodes.Ldloc_S, 20),
+                    new(OpCodes.Callvirt, Method(typeof(HashSet<ReferenceHub>), nameof(HashSet<ReferenceHub>.Contains))),
                     new(OpCodes.Brtrue_S, jmp),
                 });
 

EXILED/Exiled.Events/Patches/Events/Warhead/ChangingLeverStatus.cs

@@ -22,33 +22,32 @@ namespace Exiled.Events.Patches.Events.Warhead
     using Warhead = Handlers.Warhead;
 
     /// <summary>
-    /// Patches <see cref="PlayerInteract.UserCode_CmdUsePanel__AlphaPanelOperations" />.
+    /// Patches <see cref="AlphaWarheadNukesitePanel.ServerInteract" />.
     /// Adds the <see cref="Warhead.ChangingLeverStatus" /> event.
     /// </summary>
     [EventPatch(typeof(Warhead), nameof(Warhead.ChangingLeverStatus))]
 
-    // [HarmonyPatch(typeof(PlayerInteract), nameof(PlayerInteract.UserCode_CmdUsePanel__AlphaPanelOperations))]
+    [HarmonyPatch(typeof(AlphaWarheadNukesitePanel), nameof(AlphaWarheadNukesitePanel.ServerInteract))]
     internal static class ChangingLeverStatus
     {
-        /*private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             Label returnLabel = generator.DefineLabel();
 
-            int offset = 2;
-            int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Brtrue_S) + offset;
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Call);
 
             newInstructions.InsertRange(
                 index,
                 new[]
                 {
                     // Player.Get(component)
-                    new CodeInstruction(OpCodes.Ldloc_0).MoveLabelsFrom(newInstructions[index]),
+                    new CodeInstruction(OpCodes.Ldarg_1).MoveLabelsFrom(newInstructions[index]),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
                     // nukeside.Networkenabled
-                    new(OpCodes.Ldloc_1),
+                    new(OpCodes.Ldarg_0),
                     new(OpCodes.Call, PropertyGetter(typeof(AlphaWarheadNukesitePanel), nameof(AlphaWarheadNukesitePanel.Networkenabled))),
 
                     // true
@@ -73,6 +72,6 @@ internal static class ChangingLeverStatus
                 yield return newInstructions[z];
 
             ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }*/
+        }
     }
 }