Moved patches and fixed Scp173FirstKillPatch

ExMod-Team · Aug 6, 2024 · f7f5986 · f7f5986
1 parent 866ce48
commit f7f5986
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/....Events/Patches/Generic/ArmorDropPatch.cs → ...ed.Events/Patches/Fixes/ArmorDropPatch.cs b/....Events/Patches/Generic/ArmorDropPatch.cs → ...ed.Events/Patches/Fixes/ArmorDropPatch.cs
@@ -5,7 +5,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Exiled.Events.Patches.Generic
+namespace Exiled.Events.Patches.Fixes
 {
     using System.Collections.Generic;
     using System.Reflection.Emit;

diff --git a/...s/Patches/Generic/Scp173FirstKillPatch.cs → ...nts/Patches/Fixes/Scp173FirstKillPatch.cs b/...s/Patches/Generic/Scp173FirstKillPatch.cs → ...nts/Patches/Fixes/Scp173FirstKillPatch.cs
@@ -5,7 +5,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Exiled.Events.Patches.Generic
+namespace Exiled.Events.Patches.Fixes
 {
     using System.Collections.Generic;
     using System.Reflection.Emit;
@@ -33,11 +33,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             int index = newInstructions.FindLastIndex(x => x.opcode == OpCodes.Ldc_I4_0);
             newInstructions[index].WithLabels(continueLabel);
 
-            // TODO: NRE ON LEFT CLICK (KICK PLAYER) - DO NOT PUSH
             newInstructions.InsertRange(index, new CodeInstruction[]
             {
-                // if (hub.playerEffectController.GetEffect<SpawnProtected>().IsEnabled) return false;
-                new(OpCodes.Ldarg_1),
+                // if (hitboxIdentity.TargetHub.playerEffectController.GetEffect<SpawnProtected>().IsEnabled) return false;
+                new(OpCodes.Ldloc_2),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(HitboxIdentity), nameof(HitboxIdentity.TargetHub))),
                 new(OpCodes.Ldfld, Field(typeof(ReferenceHub), nameof(ReferenceHub.playerEffectsController))),
                 new(OpCodes.Callvirt, Method(typeof(PlayerEffectsController), nameof(PlayerEffectsController.GetEffect), generics: new[] { typeof(SpawnProtected) })),
                 new(OpCodes.Callvirt, PropertyGetter(typeof(StatusEffectBase), nameof(StatusEffectBase.IsEnabled))),

diff --git a/.../Patches/Generic/Scp173SecondKillPatch.cs → ...ts/Patches/Fixes/Scp173SecondKillPatch.cs b/.../Patches/Generic/Scp173SecondKillPatch.cs → ...ts/Patches/Fixes/Scp173SecondKillPatch.cs
@@ -5,7 +5,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Exiled.Events.Patches.Generic
+namespace Exiled.Events.Patches.Fixes
 {
     using System.Collections.Generic;
     using System.Reflection.Emit;