Skip to content
This repository was archived by the owner on Jul 8, 2025. It is now read-only.

fix: Critical CustomRole api Error & Invalid ragdoll error #45

Closed
MS-crew wants to merge 9 commits into from
Closed

fix: Critical CustomRole api Error & Invalid ragdoll error #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
204bfef
Fix Critical Error
MS-crew May 24, 2025
377a420
Merge branch 'dev' into FixCustomRoleCriticalError
MS-crew May 24, 2025
e826b4f
Update CustomRole.cs
MS-crew May 27, 2025
1aa4f77
Merge branch 'dev' into FixCustomRoleCriticalError
MS-crew May 27, 2025
d1f0bb8
Update CustomRole.cs
MS-crew May 27, 2025
fdf109a
Update CustomRole.cs
MS-crew May 27, 2025
3ae99ba
Update CustomRole.cs
MS-crew May 27, 2025
4ab72c4
Update Events.cs
MS-crew May 27, 2025
d04feb3
Update Round.cs
MS-crew May 27, 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
2 changes: 1 addition & 1 deletion EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ private void OnInternalChangingRole(ChangingRoleEventArgs ev)

private void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
{
if (Check(ev.Player))
if (Check(ev.Player) && RoleExtensions.GetTeam(Role) != Team.Dead && Role != RoleTypeId.Scp079)
ev.Role = Role;
}

Expand Down
4 changes: 3 additions & 1 deletion EXILED/Exiled.Events/Events.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public override void OnEnabled()
Handlers.Server.RestartingRound += Handlers.Internal.Round.OnRestartingRound;
Handlers.Server.RoundStarted += Handlers.Internal.Round.OnRoundStarted;
Handlers.Player.ChangingRole += Handlers.Internal.Round.OnChangingRole;
Handlers.Player.SpawningRagdoll += Handlers.Internal.Round.OnSpawningRagdoll;
Handlers.Scp049.ActivatingSense += Handlers.Internal.Round.OnActivatingSense;
Handlers.Player.Verified += Handlers.Internal.Round.OnVerified;
Handlers.Map.ChangedIntoGrenade += Handlers.Internal.ExplodingGrenade.OnChangedIntoGrenade;
Expand Down Expand Up @@ -105,6 +106,7 @@ public override void OnDisabled()
Handlers.Server.RestartingRound -= Handlers.Internal.Round.OnRestartingRound;
Handlers.Server.RoundStarted -= Handlers.Internal.Round.OnRoundStarted;
Handlers.Player.ChangingRole -= Handlers.Internal.Round.OnChangingRole;
Handlers.Player.SpawningRagdoll -= Handlers.Internal.Round.OnSpawningRagdoll;
Handlers.Scp049.ActivatingSense -= Handlers.Internal.Round.OnActivatingSense;
Handlers.Player.Verified -= Handlers.Internal.Round.OnVerified;
Handlers.Map.ChangedIntoGrenade -= Handlers.Internal.ExplodingGrenade.OnChangedIntoGrenade;
Expand Down Expand Up @@ -161,4 +163,4 @@ public void Unpatch()
Log.Debug("All events have been unpatched complete. Goodbye!");
}
}
}
}
7 changes: 7 additions & 0 deletions EXILED/Exiled.Events/Handlers/Internal/Round.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ public static void OnChangingRole(ChangingRoleEventArgs ev)
ev.Player.Inventory.ServerDropEverything();
}

/// <inheritdoc cref="Handlers.Player.OnSpawningRagdoll(SpawningRagdollEventArgs)" />
public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
{
if (RoleExtensions.GetTeam(ev.Role) == Team.Dead || ev.Role == RoleTypeId.Scp079)
ev.IsAllowed = false;
}

/// <inheritdoc cref="Scp049.OnActivatingSense(ActivatingSenseEventArgs)" />
public static void OnActivatingSense(ActivatingSenseEventArgs ev)
{
Expand Down