From 31208c26366330d75ee288d5b5487572af7125fc Mon Sep 17 00:00:00 2001 From: metalgearsloth Date: Wed, 13 Oct 2021 12:51:47 +1100 Subject: [PATCH] Remove obsolete IActionBlocker interfaces --- .../ActionBlocker/ActionBlockerSystem.cs | 18 ------------------ Content.Shared/ActionBlocker/IActionBlocker.cs | 6 ------ 2 files changed, 24 deletions(-) diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs index 075c324947..ce12643b59 100644 --- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs @@ -293,15 +293,6 @@ namespace Content.Shared.ActionBlocker { var ev = new ShiverAttemptEvent(entity); - foreach (var blocker in ev.Entity.GetAllComponents()) - { - if (!blocker.CanShiver()) - { - ev.Cancel(); - break; - } - } - return !ev.Cancelled; } @@ -316,15 +307,6 @@ namespace Content.Shared.ActionBlocker RaiseLocalEvent(entity.Uid, ev); - foreach (var blocker in ev.Entity.GetAllComponents()) - { - if (!blocker.CanSweat()) - { - ev.Cancel(); - break; - } - } - return !ev.Cancelled; } diff --git a/Content.Shared/ActionBlocker/IActionBlocker.cs b/Content.Shared/ActionBlocker/IActionBlocker.cs index cdcae76223..4d0a78bc79 100644 --- a/Content.Shared/ActionBlocker/IActionBlocker.cs +++ b/Content.Shared/ActionBlocker/IActionBlocker.cs @@ -42,11 +42,5 @@ namespace Content.Shared.ActionBlocker [Obsolete("Use ChangeDirectionAttemptEvent instead")] bool CanChangeDirection() => true; - - [Obsolete("Use ShiverAttemptEvent instead")] - bool CanShiver() => true; - - [Obsolete("Use SweatAttemptEvent instead")] - bool CanSweat() => true; } }