Some fixes

Author: MikeSus1

EXILED/EXILED.props

@@ -15,7 +15,7 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">9.6.0</Version>
+    <Version Condition="$(Version) == ''">9.6.1</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 

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

@@ -25,11 +25,12 @@ public class KeybindSetting : SettingBase, IWrapper<SSKeybindSetting>
         /// <param name="label"><inheritdoc cref="SettingBase.Label"/></param>
         /// <param name="suggested"><inheritdoc cref="KeyCode"/></param>
         /// <param name="preventInteractionOnGUI"><inheritdoc cref="PreventInteractionOnGUI"/></param>
+        /// <param name="allowSpectatorTrigger"><inheritdoc cref="AllowSpectatorTrigger"/></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>
-        public KeybindSetting(int id, string label, KeyCode suggested, bool preventInteractionOnGUI = false, string hintDescription = "", HeaderSetting header = null, Action<Player, SettingBase> onChanged = null)
-            : base(new SSKeybindSetting(id, label, suggested, preventInteractionOnGUI, hintDescription), header, onChanged)
+        public KeybindSetting(int id, string label, KeyCode suggested, bool preventInteractionOnGUI = false, bool allowSpectatorTrigger = false, string hintDescription = "", HeaderSetting header = null, Action<Player, SettingBase> onChanged = null)
+            : base(new SSKeybindSetting(id, label, suggested, preventInteractionOnGUI, allowSpectatorTrigger, hintDescription), header, onChanged)
         {
             Base = (SSKeybindSetting)base.Base;
         }
@@ -61,6 +62,15 @@ public bool PreventInteractionOnGUI
             set => Base.PreventInteractionOnGUI = value;
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the interaction is prevented in spectator roles.
+        /// </summary>
+        public bool AllowSpectatorTrigger
+        {
+            get => Base.AllowSpectatorTrigger;
+            set => Base.AllowSpectatorTrigger = value;
+        }
+
         /// <summary>
         /// Gets or sets the assigned key.
         /// </summary>

EXILED/Exiled.API/Features/Player.cs

@@ -1163,6 +1163,11 @@ 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>
@@ -2072,7 +2077,7 @@ public void SetScale(Vector3 scale, IEnumerable<Player> viewers)
 
             try
             {
-                ReferenceHub.transform.localScale = scale;
+                ScaleController.Scale = scale;
 
                 foreach (Player target in viewers)
                     Server.SendSpawnMessage?.Invoke(null, new object[] { NetworkIdentity, target.Connection });
@@ -2094,12 +2099,12 @@ public void SetFakeScale(Vector3 fakeScale, IEnumerable<Player> viewers)
 
             try
             {
-                ReferenceHub.transform.localScale = fakeScale;
+                ScaleController.Scale = fakeScale;
 
                 foreach (Player target in viewers)
                     Server.SendSpawnMessage.Invoke(null, new object[] { NetworkIdentity, target.Connection });
 
-                ReferenceHub.transform.localScale = currentScale;
+                ScaleController.Scale = currentScale;
             }
             catch (Exception ex)
             {

EXILED/Exiled.Events/Patches/Events/Player/Interacted.cs

@@ -14,19 +14,18 @@ namespace Exiled.Events.Patches.Events.Player
     using API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Player;
-
     using HarmonyLib;
-
+    using Interactables;
     using UnityEngine;
 
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="PlayerInteract.OnInteract" />.
+    /// Patches <see cref="InteractionCoordinator.ClientInteract" />.
     /// Adds the <see cref="Handlers.Player.Interacted" /> event.
     /// </summary>
     [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.Interacted))]
-    [HarmonyPatch(typeof(PlayerInteract), nameof(PlayerInteract.OnInteract))]
+    [HarmonyPatch(typeof(InteractionCoordinator), nameof(InteractionCoordinator.ClientInteract))]
     internal static class Interacted
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
@@ -39,7 +38,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 {
                     // Handlers.Player.OnInteracted(new InteractedEventArgs(Player.Get(this.gameObject)));
                     new(OpCodes.Ldarg_0),
-                    new(OpCodes.Call, PropertyGetter(typeof(PlayerInteract), nameof(PlayerInteract.gameObject))),
+                    new(OpCodes.Call, PropertyGetter(typeof(InteractionCoordinator), nameof(InteractionCoordinator.gameObject))),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(GameObject) })),
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(InteractedEventArgs))[0]),
                     new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnInteracted))),

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

@@ -26,10 +26,11 @@ namespace Exiled.Events.Patches.Events.Warhead
     /// Adds the <see cref="Warhead.ChangingLeverStatus" /> event.
     /// </summary>
     [EventPatch(typeof(Warhead), nameof(Warhead.ChangingLeverStatus))]
-    [HarmonyPatch(typeof(PlayerInteract), nameof(PlayerInteract.UserCode_CmdUsePanel__AlphaPanelOperations))]
+
+    // [HarmonyPatch(typeof(PlayerInteract), nameof(PlayerInteract.UserCode_CmdUsePanel__AlphaPanelOperations))]
     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);
 
@@ -72,6 +73,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 yield return newInstructions[z];
 
             ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
+        }*/
     }
 }