diff --git a/MiraAPI/Networking/CustomMurderRpc.cs b/MiraAPI/Networking/CustomMurderRpc.cs index f94223b..710791a 100644 --- a/MiraAPI/Networking/CustomMurderRpc.cs +++ b/MiraAPI/Networking/CustomMurderRpc.cs @@ -87,11 +87,11 @@ public static class CustomMurderRpc bool playKillSound = true) { source.isKilling = false; - var data = target.Data; if (resultFlags.HasFlag(MurderResultFlags.FailedError)) { return; } + var data = target.Data; if (resultFlags.HasFlag(MurderResultFlags.FailedProtected) || (resultFlags.HasFlag(MurderResultFlags.DecisionByHost) && target.protectedByGuardianId > -1)) diff --git a/MiraAPI/Patches/Roles/KillButtonPatches.cs b/MiraAPI/Patches/Roles/KillButtonPatches.cs index 902a9e6..4001425 100644 --- a/MiraAPI/Patches/Roles/KillButtonPatches.cs +++ b/MiraAPI/Patches/Roles/KillButtonPatches.cs @@ -46,7 +46,7 @@ public static class KillButtonPatches } /// - /// Use Custom Murder if player is custom role. + /// Use Custom Murder instead of Murder Player from vanilla. /// [HarmonyPrefix] [HarmonyPatch(nameof(KillButton.DoClick))] @@ -58,11 +58,6 @@ public static class KillButtonPatches return false; } - if (PlayerControl.LocalPlayer.Data.Role is not ICustomRole) - { - return true; - } - PlayerControl.LocalPlayer.RpcCustomMurder(__instance.currentTarget); __instance.SetTarget(null);