Skip to content
This repository was archived by the owner on Jul 8, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions EXILED/Exiled.Events/EventArgs/Player/DiedEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ namespace Exiled.Events.EventArgs.Player
using Interfaces;

using PlayerRoles;
using PlayerRoles.Ragdolls;

using CustomAttackerHandler = API.Features.DamageHandlers.AttackerDamageHandler;
using DamageHandlerBase = PlayerStatsSystem.DamageHandlerBase;

/// <summary>
/// Contains all information after a player dies.
/// </summary>
public class DiedEventArgs : IPlayerEvent, IAttackerEvent
public class DiedEventArgs : IPlayerEvent, IAttackerEvent, IRagdollEvent
{
/// <summary>
/// Initializes a new instance of the <see cref="DiedEventArgs" /> class.
Expand All @@ -32,12 +33,16 @@ public class DiedEventArgs : IPlayerEvent, IAttackerEvent
/// <param name="damageHandler">
/// <inheritdoc cref="DamageHandler" />
/// </param>
public DiedEventArgs(Player target, RoleTypeId targetOldRole, DamageHandlerBase damageHandler)
/// <param name="ragdoll">
/// <inheritdoc cref="Ragdoll" />
/// </param>
public DiedEventArgs(Player target, RoleTypeId targetOldRole, DamageHandlerBase damageHandler, BasicRagdoll ragdoll)
{
DamageHandler = new CustomDamageHandler(target, damageHandler);
Attacker = DamageHandler.BaseIs(out CustomAttackerHandler attackerDamageHandler) ? attackerDamageHandler.Attacker : null;
Player = target;
TargetOldRole = targetOldRole;
Ragdoll = Ragdoll.Get(ragdoll);
}

/// <summary>
Expand All @@ -59,5 +64,10 @@ public DiedEventArgs(Player target, RoleTypeId targetOldRole, DamageHandlerBase
/// Gets the attacker.
/// </summary>
public Player Attacker { get; }

/// <summary>
/// Gets ragdoll of the dead player.
/// </summary>
public Ragdoll Ragdoll { get; }
}
}
11 changes: 10 additions & 1 deletion EXILED/Exiled.Events/Patches/Events/Player/DyingAndDied.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ namespace Exiled.Events.Patches.Events.Player
using HarmonyLib;

using PlayerRoles;
using PlayerRoles.Ragdolls;

using PlayerStatsSystem;

Expand All @@ -41,6 +42,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi

LocalBuilder player = generator.DeclareLocal(typeof(Player));
LocalBuilder oldRole = generator.DeclareLocal(typeof(RoleTypeId));
LocalBuilder ragdoll = generator.DeclareLocal(typeof(BasicRagdoll));

newInstructions.InsertRange(
0,
Expand Down Expand Up @@ -77,6 +79,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
new(OpCodes.Stloc, oldRole.LocalIndex),
});

int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Pop);

newInstructions[index] = new CodeInstruction(OpCodes.Stloc, ragdoll.LocalIndex);

newInstructions.InsertRange(
newInstructions.Count - 1,
new CodeInstruction[]
Expand All @@ -90,6 +96,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
// handler
new(OpCodes.Ldarg_1),

// ragdoll
new(OpCodes.Ldloc_S, ragdoll.LocalIndex),

// DiedEventArgs evDied = new(Player, RoleTypeId, DamageHandlerBase)
new(OpCodes.Newobj, GetDeclaredConstructors(typeof(DiedEventArgs))[0]),

Expand All @@ -105,4 +114,4 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
ListPool<CodeInstruction>.Pool.Return(newInstructions);
}
}
}
}
Loading