Skip to content

fix: Landing not being called for Scp173 #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
louis1706 merged 2 commits into from
Dec 24, 2025
Merged

fix: Landing not being called for Scp173 #704

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a3b0ea
fix: Landing
louis1706 Dec 23, 2025
223dae4
wrong offset
louis1706 Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,34 @@ namespace Exiled.Events.Patches.Events.Player
using Exiled.Events.Attributes;
using Exiled.Events.EventArgs.Player;
using Exiled.Events.Handlers;

using HarmonyLib;

using PlayerRoles.FirstPersonControl;
using PlayerRoles.FirstPersonControl.Thirdperson;

using static HarmonyLib.AccessTools;

/// <summary>
/// Patches <see cref="AnimatedCharacterModel.OnGrounded" />
/// Patches <see cref="FirstPersonMovementModule.IsGrounded" />
/// Adds the <see cref="Player.Landing" /> event.
/// </summary>
[EventPatch(typeof(Player), nameof(Player.Landing))]
[HarmonyPatch(typeof(AnimatedCharacterModel), nameof(AnimatedCharacterModel.OnGrounded))]
[HarmonyPatch(typeof(FirstPersonMovementModule), nameof(FirstPersonMovementModule.IsGrounded), MethodType.Setter)]
internal static class Landing
{
private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
{
List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);

const int offset = -1;
int index = newInstructions.FindIndex(
instruction => instruction.Calls(Method(typeof(AnimatedCharacterModel), nameof(AnimatedCharacterModel.PlayFootstep)))) + offset;
const int offset = 2;
int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Ldarg_1) + offset;

newInstructions.InsertRange(
index,
new[]
{
// Player.Get(base.OwnerHub)
// Player.Get(this.Hub)
new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
new(OpCodes.Callvirt, PropertyGetter(typeof(CharacterModel), nameof(CharacterModel.OwnerHub))),
new(OpCodes.Callvirt, PropertyGetter(typeof(FirstPersonMovementModule), nameof(FirstPersonMovementModule.Hub))),
new(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),

// LandingEventArgs ev = new(Player)
Expand Down
Loading