From 6cf6546d30104fb9087371571afd85fa9ea24e82 Mon Sep 17 00:00:00 2001
From: Mike <146554836+MikeSus1@users.noreply.github.com>
Date: Thu, 19 Jun 2025 09:46:41 +0200
Subject: [PATCH 1/2] fix: Update spawning logic to use IsFpcRole for role
 vdation

---
 EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs | 2 +-
 EXILED/Exiled.Events/Handlers/Internal/Round.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
index ffb364760e..97790a3e24 100644
--- a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
+++ b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -936,7 +936,7 @@ private void OnInternalChangingRole(ChangingRoleEventArgs ev)
 
         private void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
-            if (Check(ev.Player) && !Role.IsDead() && Role != RoleTypeId.Scp079)
+            if (Check(ev.Player) && Role.IsFpcRole())
                 ev.Role = Role;
         }
 
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index 7df3f63007..ae8dbb5b4e 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -85,7 +85,7 @@ public static void OnChangingRole(ChangingRoleEventArgs ev)
         /// <inheritdoc cref="Handlers.Player.OnSpawningRagdoll(SpawningRagdollEventArgs)" />
         public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
-            if (ev.Role.IsDead() || ev.Role == RoleTypeId.Scp079)
+            if (ev.Role.IsDead() || ev.Role.IsFpcRole())
                 ev.IsAllowed = false;
         }
 

From a6cf26e8afd69ea5f1c8893cbb4461cf47bb1290 Mon Sep 17 00:00:00 2001
From: Mike <146554836+MikeSus1@users.noreply.github.com>
Date: Thu, 19 Jun 2025 10:07:00 +0200
Subject: [PATCH 2/2] fix: Invert FpcRole checks in spawning logic for ragdolls

---
 EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs | 2 +-
 EXILED/Exiled.Events/Handlers/Internal/Round.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
index 97790a3e24..8e1620730f 100644
--- a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
+++ b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -936,7 +936,7 @@ private void OnInternalChangingRole(ChangingRoleEventArgs ev)
 
         private void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
-            if (Check(ev.Player) && Role.IsFpcRole())
+            if (Check(ev.Player) && !Role.IsFpcRole())
                 ev.Role = Role;
         }
 
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index ae8dbb5b4e..f81b0886b9 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -85,7 +85,7 @@ public static void OnChangingRole(ChangingRoleEventArgs ev)
         /// <inheritdoc cref="Handlers.Player.OnSpawningRagdoll(SpawningRagdollEventArgs)" />
         public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
-            if (ev.Role.IsDead() || ev.Role.IsFpcRole())
+            if (ev.Role.IsDead() || !ev.Role.IsFpcRole())
                 ev.IsAllowed = false;
         }