Fixed Error & InteractingScp330 IL Code

louis1706 · louis1706 · commit 841a5cefed1f · 2025-04-05T18:58:09.000+02:00
diff --git a/EXILED/Exiled.API/Features/Lockers/Chamber.cs b/EXILED/Exiled.API/Features/Lockers/Chamber.cs
@@ -245,6 +245,6 @@ public Vector3 GetRandomSpawnPoint()
         /// </summary>
         /// <param name="chamber"><see cref="LockerChamber"/>.</param>
         /// <returns><see cref="Chamber"/>.</returns>
-        internal static Chamber Get(LockerChamber chamber) => Chambers.TryGetValue(chamber, out Chamber chmb) ? chmb : new(chamber, Locker.Get(x => x.Chambers.Any(x => x.Base == chamber)).FirstOrDefault());
+        internal static Chamber Get(LockerChamber chamber) => chamber == null ? null : Chambers.TryGetValue(chamber, out Chamber chmb) ? chmb : new(chamber, Locker.Get(x => x.Chambers.Any(x => x.Base == chamber)).FirstOrDefault());
     }
 }
diff --git a/EXILED/Exiled.API/Features/Pickups/ExplosiveGrenadePickup.cs b/EXILED/Exiled.API/Features/Pickups/ExplosiveGrenadePickup.cs
@@ -96,8 +96,8 @@ protected override void InitializeProperties(ItemBase itemBase)
             base.InitializeProperties(itemBase);
             if (itemBase is ThrowableItem throwable && throwable.Projectile is ExplosionGrenade explosiveGrenade)
             {
-                MaxRadius = explosiveGrenade._maxRadius;
-                ScpDamageMultiplier = explosiveGrenade._scpDamageMultiplier;
+                MaxRadius = explosiveGrenade.MaxRadius;
+                ScpDamageMultiplier = explosiveGrenade.ScpDamageMultiplier;
                 BurnDuration = explosiveGrenade._burnedDuration;
                 DeafenDuration = explosiveGrenade._deafenedDuration;
                 ConcussDuration = explosiveGrenade._concussedDuration;
diff --git a/EXILED/Exiled.API/Features/Pickups/Projectiles/ExplosionGrenadeProjectile.cs b/EXILED/Exiled.API/Features/Pickups/Projectiles/ExplosionGrenadeProjectile.cs
@@ -49,8 +49,8 @@ internal ExplosionGrenadeProjectile(ItemType type)
         /// </summary>
         public float MaxRadius
         {
-            get => Base._maxRadius;
-            set => Base._maxRadius = value;
+            get => Base.MaxRadius;
+            set => Base.MaxRadius = value;
         }
 
         /// <summary>
@@ -94,8 +94,8 @@ public float ConcussDuration
         /// </summary>
         public float ScpDamageMultiplier
         {
-            get => Base._scpDamageMultiplier;
-            set => Base._scpDamageMultiplier = value;
+            get => Base.ScpDamageMultiplier;
+            set => Base.ScpDamageMultiplier = value;
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.API/Features/Roles/Scp079Role.cs b/EXILED/Exiled.API/Features/Roles/Scp079Role.cs
@@ -593,7 +593,7 @@ public void ActivateTesla(bool consumeEnergy = true)
             Scp079Camera cam = CurrentCameraSync.CurrentCamera;
             RewardManager.MarkRoom(cam.Room);
 
-            if (!global::TeslaGate.AllGates.TryGetFirst(x => RoomIdUtils.IsTheSameRoom(cam.Position, x.transform.position), out global::TeslaGate teslaGate))
+            if (!global::TeslaGate.AllGates.TryGetFirst(x => RoomUtils.IsTheSameRoom(cam.Position, x.transform.position), out global::TeslaGate teslaGate))
                 return;
 
             if (consumeEnergy)
diff --git a/EXILED/Exiled.API/Features/Room.cs b/EXILED/Exiled.API/Features/Room.cs
@@ -246,7 +246,7 @@ public static Room Get(RoomIdentifier roomIdentifier) => roomIdentifier == null
         /// </summary>
         /// <param name="position">The <see cref="Vector3"/> to search for.</param>
         /// <returns>The <see cref="Room"/> with the given <see cref="Vector3"/> or <see langword="null"/> if not found.</returns>
-        public static Room Get(Vector3 position) => RoomIdUtils.RoomAtPositionRaycasts(position, false) is RoomIdentifier identifier ? Get(identifier) : null;
+        public static Room Get(Vector3 position) => RoomUtils.RoomAtPositionRaycasts(position, false) is RoomIdentifier identifier ? Get(identifier) : null;
 
         /// <summary>
         /// Gets a <see cref="Room"/> given the specified <see cref="RelativePosition"/>.
diff --git a/EXILED/Exiled.Events/EventArgs/Map/FillingLockerEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Map/FillingLockerEventArgs.cs
@@ -41,7 +41,7 @@ public FillingLockerEventArgs(ItemPickupBase pickupBase, LockerChamber lockerCha
         /// <summary>
         /// Gets a locker which is containing <see cref="Chamber"/>.
         /// </summary>
-        public API.Features.Lockers.Locker Locker => Chamber.Locker;
+        public API.Features.Lockers.Locker Locker => Chamber?.Locker;
 
         /// <summary>
         /// Gets a chamber which is filling.
diff --git a/EXILED/Exiled.Events/EventArgs/Scp330/InteractingScp330EventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp330/InteractingScp330EventArgs.cs
@@ -21,31 +21,29 @@ public class InteractingScp330EventArgs : IPlayerEvent, IScp330Event, IDeniableE
         /// <summary>
         /// Initializes a new instance of the <see cref="InteractingScp330EventArgs" /> class.
         /// </summary>
-        /// <param name="player">
+        /// <param name="referenceHub">
         /// <inheritdoc cref="Player" />
         /// </param>
         /// <param name="usage">
         /// <inheritdoc cref="UsageCount" />
         /// </param>
-        public InteractingScp330EventArgs(Player player, int usage)
+        /// <param name="shouldPlaySound">
+        /// <inheritdoc cref="ShouldPlaySound" />
+        /// </param>
+        /// <param name="shouldSever">
+        /// <inheritdoc cref="ShouldSever" />
+        /// </param>
+        /// <param name="candy">
+        /// <inheritdoc cref="Candy" />
+        /// </param>
+        public InteractingScp330EventArgs(ReferenceHub referenceHub, int usage, bool shouldPlaySound, bool shouldSever, CandyKindID candy)
         {
-            Player = player;
+            Player = Player.Get(referenceHub);
             UsageCount = usage;
             ShouldSever = usage >= 2;
-            ShouldPlaySound = true;
+            ShouldPlaySound = shouldPlaySound;
             IsAllowed = Player.IsHuman;
             Candy = Scp330Candies.GetRandom();
-
-            if (Scp330Bag.TryGetBag(player.ReferenceHub, out Scp330Bag scp330Bag))
-            {
-                Scp330 = (Scp330)Item.Get(scp330Bag);
-            }
-            else
-            {
-                Scp330 = (Scp330)Item.Create(ItemType.SCP330, player);
-                Scp330.RemoveAllCandy();
-                player.AddItem(Scp330);
-            }
         }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/Patches/Events/Map/ExplodingFlashGrenade.cs b/EXILED/Exiled.Events/Patches/Events/Map/ExplodingFlashGrenade.cs
@@ -73,7 +73,7 @@ private static void ProcessEvent(FlashbangGrenade instance, float distance)
                     continue;
                 if (!IndividualFriendlyFire.CheckFriendlyFirePlayer(instance.PreviousOwner, player.ReferenceHub) && !instance.PreviousOwner.CompareLife(player.ReferenceHub))
                     continue;
-                if (Physics.Linecast(instance.transform.position, player.CameraTransform.position, instance._blindingMask))
+                if (Physics.Linecast(instance.transform.position, player.CameraTransform.position, instance.BlindingMask))
                     continue;
 
                 targetToAffect.Add(player);
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp0492/Consumed.cs b/EXILED/Exiled.Events/Patches/Events/Scp0492/Consumed.cs
@@ -38,35 +38,32 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             LocalBuilder ev = generator.DeclareLocal(typeof(ConsumedCorpseEventArgs));
 
-            int offset = 1;
-            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset;
-
             Label returnLabel = generator.DefineLabel();
 
             newInstructions.InsertRange(
-                index,
+                0,
                 new[]
                 {
-                    // Player.Get(base.Owner)
-                    new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
+                    // base.Owner
+                    new CodeInstruction(OpCodes.Ldarg_0),
                     new(OpCodes.Call, PropertyGetter(typeof(StandardSubroutine<ZombieRole>), nameof(StandardSubroutine<ZombieRole>.Owner))),
 
                     // base.CurRagdoll
                     new CodeInstruction(OpCodes.Ldarg_0),
                     new(OpCodes.Call, PropertyGetter(typeof(RagdollAbilityBase<ZombieRole>), nameof(RagdollAbilityBase<ZombieRole>.CurRagdoll))),
 
-                    // ConsumingCorpseEventArgs ev = new(Player, Ragdoll, bool)
+                    // ConsumingCorpseEventArgs ev = new(ReferenceHub, Ragdoll, bool)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(ConsumedCorpseEventArgs))[0]),
                     new(OpCodes.Dup),
                     new(OpCodes.Stloc_S, ev.LocalIndex),
 
-                    // Handlers.Scp049.OnSendingCall(ev)
+                    // Handlers.Scp049.OnConsumedCorpse(ev)
                     new(OpCodes.Call, Method(typeof(Handlers.Scp0492), nameof(Handlers.Scp0492.OnConsumedCorpse))),
                 });
 
-            // replace "base.Owner.playerStats.GetModule<HealthStat>().ServerHeal(100f)" with "base.Owner.playerStats.GetModule<HealthStat>().ServerHeal(ev.ConsumeHeal)"
-            offset = -1;
-            index = newInstructions.FindIndex(instruction => instruction.operand == (object)Method(typeof(HealthStat), nameof(HealthStat.ServerHeal))) + offset;
+            // replace "Scp0492ConsumingCorpseEventArgs(base.Owner, base.CurRagdoll, 100f);" with "Scp0492ConsumingCorpseEventArgs(base.Owner, base.CurRagdoll, ev.ConsumeHeal);"
+            int offset = -1;
+            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Ldc_R4 && (float)x.operand == ZombieConsumeAbility.ConsumeHeal) + offset;
             newInstructions.RemoveAt(index);
 
             newInstructions.InsertRange(
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp330/InteractingScp330.cs b/EXILED/Exiled.Events/Patches/Events/Scp330/InteractingScp330.cs
@@ -46,105 +46,57 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             // Remove original "No scp can touch" logic.
             newInstructions.RemoveRange(0, 3);
 
-            // Find ServerProcessPickup, insert before it.
-            int offset = -3;
+            int offset = 2;
             int index = newInstructions.FindLastIndex(
-                instruction => instruction.Calls(Method(typeof(Scp330Bag), nameof(Scp330Bag.ServerProcessPickup)))) + offset;
+                instruction => instruction.Calls(Method(typeof(Scp330Candies), nameof(Scp330Candies.GetRandom)))) + offset;
 
             newInstructions.InsertRange(
                 index,
                 new[]
                 {
-                    // Player.Get(ply)
-                    new CodeInstruction(OpCodes.Ldarg_1).MoveLabelsFrom(newInstructions[index]),
-                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+                    // ply
+                    new CodeInstruction(OpCodes.Ldarg_1),
 
-                    // num2
+                    // usage
                     new(OpCodes.Ldloc_1),
 
-                    // InteractingScp330EventArgs ev = new(Player, int)
+                    // shouldPlaySound
+                    new(OpCodes.Ldloc_2),
+
+                    // shouldSever
+                    new(OpCodes.Ldloc_3),
+
+                    // candyKindID
+                    new(OpCodes.Ldloc_S, 4),
+
+                    // InteractingScp330EventArgs ev = new(ReferenceHub, int, bool, bool, CandyKindID)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(InteractingScp330EventArgs))[0]),
                     new(OpCodes.Dup),
                     new(OpCodes.Dup),
                     new(OpCodes.Stloc, ev.LocalIndex),
 
                     // Scp330.OnInteractingScp330(ev)
                     new(OpCodes.Call, Method(typeof(Handlers.Scp330), nameof(Handlers.Scp330.OnInteractingScp330))),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Dup),
 
-                    // if (!ev.IsAllowed)
-                    //    return;
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(InteractingScp330EventArgs), nameof(InteractingScp330EventArgs.IsAllowed))),
-                    new(OpCodes.Brfalse, returnLabel),
-
-                    // ldarg.1 to player
-                    new(OpCodes.Ldarg_1),
-
-                    // ev.Candy
-                    new(OpCodes.Ldloc, ev.LocalIndex),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(InteractingScp330EventArgs), nameof(InteractingScp330EventArgs.Candy))),
-
-                    // bag
-                    new(OpCodes.Ldloca_S, 2),
-
-                    // ServerProcessPickup(ReferenceHub, CandyKindID, Scp330Bag)
-                    new CodeInstruction(OpCodes.Call, Method(typeof(InteractingScp330), nameof(ServerProcessPickup), new[] { typeof(ReferenceHub), typeof(CandyKindID), typeof(Scp330Bag).MakeByRefType() })),
-                });
-
-            int remove_offset = -3;
-            int remove_index = newInstructions.FindLastIndex(
-                instruction => instruction.Calls(Method(typeof(Scp330Bag), nameof(Scp330Bag.ServerProcessPickup)))) + remove_offset;
-
-            // Remove original add candy logic
-            newInstructions.RemoveRange(remove_index, 4);
-
-            /* next code will used to override sound rpc check by EXILED
-             * old:
-             *   if (args.PlaySound)
-             * new:
-             *   if (args.PlaySound | ev.PlaySound)
-             */
-            offset = 1;
-            index = newInstructions.FindLastIndex(
-                instruction => instruction.Calls(PropertyGetter(typeof(LabApi.Events.Arguments.PlayerEvents.PlayerInteractingScp330EventArgs), nameof(LabApi.Events.Arguments.PlayerEvents.PlayerInteractingScp330EventArgs.PlaySound)))) + offset;
-            newInstructions.InsertRange(
-                index,
-                new[]
-                {
-                    // load ev.ShouldPlaySound and or operation with nw property.
-                    new CodeInstruction(OpCodes.Ldloc_S, ev.LocalIndex),
+                    // shouldPlaySound = ev.ShouldPlaySound
                     new(OpCodes.Callvirt, PropertyGetter(typeof(InteractingScp330EventArgs), nameof(InteractingScp330EventArgs.ShouldPlaySound))),
-                    new(OpCodes.Or),
-                });
-            /* next code will used to override Sever check by EXILED
-             * old:
-             *   if (args.AllowPunishment && uses >= 2)
-             * new:
-             *   if (args.AllowPunishment && ev.ShouldSever)
-             */
+                    new(OpCodes.Stloc, 2),
 
-            // set `notSeverLabel`
-            offset = -1;
-            index = newInstructions.FindLastIndex(
-                instruction => instruction.LoadsField(Field(typeof(Scp330Interobject), nameof(Scp330Interobject._previousUses)))) + offset;
-
-            Label notSeverLabel = newInstructions[index].labels[0];
-
-            offset = 2;
-            index = newInstructions.FindLastIndex(
-                instruction => instruction.Calls(PropertyGetter(typeof(LabApi.Events.Arguments.PlayerEvents.PlayerInteractingScp330EventArgs), nameof(LabApi.Events.Arguments.PlayerEvents.PlayerInteractingScp330EventArgs.AllowPunishment)))) + offset;
+                    // shouldSever = ev.ShouldSever
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(InteractingScp330EventArgs), nameof(InteractingScp330EventArgs.ShouldSever))),
+                    new(OpCodes.Stloc, 3),
 
-            // remove `uses >= 2` check, to override that by ev.ShouldSever
-            newInstructions.RemoveRange(index, 3);
+                    // candyKindID = ev.Candy
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(InteractingScp330EventArgs), nameof(InteractingScp330EventArgs.Candy))),
+                    new(OpCodes.Stloc_S, 4),
 
-            newInstructions.InsertRange(
-                index,
-                new[]
-                {
-                    // if (!ev.ShouldSever)
-                    //    goto shouldNotSever;
-                    new CodeInstruction(OpCodes.Ldloc_S, ev.LocalIndex),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(InteractingScp330EventArgs), nameof(InteractingScp330EventArgs.ShouldSever))),
-                    new(OpCodes.Brfalse_S, notSeverLabel),
+                    // if (!ev.IsAllowed)
+                    //    return;
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(InteractingScp330EventArgs), nameof(InteractingScp330EventArgs.IsAllowed))),
+                    new(OpCodes.Brfalse, returnLabel),
                 });
 
             newInstructions[newInstructions.Count - 1].labels.Add(returnLabel);
@@ -154,28 +106,5 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
-
-        private static bool ServerProcessPickup(ReferenceHub player, CandyKindID candy, out Scp330Bag bag)
-        {
-            if (!Scp330Bag.TryGetBag(player, out bag))
-            {
-                player.inventory.ServerAddItem(ItemType.SCP330, ItemAddReason.AdminCommand);
-
-                if (!Scp330Bag.TryGetBag(player, out bag))
-                    return false;
-
-                bag.Candies = new List<CandyKindID> { candy };
-                bag.ServerRefreshBag();
-
-                return true;
-            }
-
-            bool result = bag.TryAddSpecific(candy);
-
-            if (bag.AcquisitionAlreadyReceived)
-                bag.ServerRefreshBag();
-
-            return result;
-        }
     }
 }
diff --git a/EXILED/Exiled.Events/Patches/Generic/LockerList.cs b/EXILED/Exiled.Events/Patches/Generic/LockerList.cs
@@ -20,23 +20,28 @@ namespace Exiled.Events.Patches.Generic
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="MapGeneration.Distributors.Locker.Start"/>.
+    /// Patches <see cref="SpawnableStructure.Start"/>.
     /// </summary>
-    [HarmonyPatch(typeof(MapGeneration.Distributors.Locker), nameof(MapGeneration.Distributors.Locker.Start))]
+    [HarmonyPatch(typeof(SpawnableStructure), nameof(SpawnableStructure.Start))]
     internal class LockerList
     {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> codeInstructions)
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> codeInstructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(codeInstructions);
 
+            Label jump = generator.DefineLabel();
+
             // new Locker(this)
             newInstructions.InsertRange(
                 0,
                 new CodeInstruction[]
                 {
                     new(OpCodes.Ldarg_0),
+                    new(OpCodes.Isinst, typeof(MapGeneration.Distributors.Locker)),
+                    new(OpCodes.Dup),
+                    new(OpCodes.Brfalse_S, jump),
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(API.Features.Lockers.Locker))[0]),
-                    new(OpCodes.Pop),
+                    new CodeInstruction(OpCodes.Pop).WithLabels(jump),
                 });
 
             for (int z = 0; z < newInstructions.Count; z++)
diff --git a/EXILED/Exiled.Events/Patches/Generic/RoomList.cs b/EXILED/Exiled.Events/Patches/Generic/RoomList.cs
@@ -35,7 +35,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(codeInstructions);
 
             int offset = -3;
-            int index = newInstructions.FindIndex(i => i.Calls(Method(typeof(RoomIdUtils), nameof(RoomIdUtils.PositionToCoords)))) + offset;
+            int index = newInstructions.FindIndex(i => i.Calls(Method(typeof(RoomUtils), nameof(RoomUtils.PositionToCoords)))) + offset;
 
             // Room.Get(gameObject).InternalCreate();
             newInstructions.InsertRange(

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,6 @@ public Vector3 GetRandomSpawnPoint()`
`245`	`245`	`/// </summary>`
`246`	`246`	`/// <param name="chamber"><see cref="LockerChamber"/>.</param>`
`247`	`247`	`/// <returns><see cref="Chamber"/>.</returns>`
`248`		`- internal static Chamber Get(LockerChamber chamber) => Chambers.TryGetValue(chamber, out Chamber chmb) ? chmb : new(chamber, Locker.Get(x => x.Chambers.Any(x => x.Base == chamber)).FirstOrDefault());`
	`248`	`+ internal static Chamber Get(LockerChamber chamber) => chamber == null ? null : Chambers.TryGetValue(chamber, out Chamber chmb) ? chmb : new(chamber, Locker.Get(x => x.Chambers.Any(x => x.Base == chamber)).FirstOrDefault());`
`249`	`249`	`}`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ internal ExplosionGrenadeProjectile(ItemType type)`
`49`	`49`	`/// </summary>`
`50`	`50`	`public float MaxRadius`
`51`	`51`	`{`
`52`		`- get => Base._maxRadius;`
`53`		`- set => Base._maxRadius = value;`
	`52`	`+ get => Base.MaxRadius;`
	`53`	`+ set => Base.MaxRadius = value;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/// <summary>`
`@@ -94,8 +94,8 @@ public float ConcussDuration`
`94`	`94`	`/// </summary>`
`95`	`95`	`public float ScpDamageMultiplier`
`96`	`96`	`{`
`97`		`- get => Base._scpDamageMultiplier;`
`98`		`- set => Base._scpDamageMultiplier = value;`
	`97`	`+ get => Base.ScpDamageMultiplier;`
	`98`	`+ set => Base.ScpDamageMultiplier = value;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`/// <summary>`