ActionBlocker CanShiver uses EntityUid exclusively

Author: gradientvera

Content.Server/Body/Respiratory/RespiratorComponent.cs

@@ -289,19 +289,19 @@ private void ProcessThermalRegulation(float frameTime)
                 // creadth: sweating does not help in airless environment
                 if (EntitySystem.Get<AtmosphereSystem>().GetTileMixture(Owner.Transform.Coordinates) is not {})
                 {
-                    temperatureSystem.RemoveHeat(Owner.Uid, Math.Min(targetHeat, SweatHeatRegulation), temperatureComponent);
+                    temperatureSystem.RemoveHeat(OwnerUid, Math.Min(targetHeat, SweatHeatRegulation), temperatureComponent);
                 }
             }
             else
             {
-                if (!actionBlocker.CanShiver(Owner)) return;
+                if (!actionBlocker.CanShiver(OwnerUid)) return;
                 if (!_isShivering)
                 {
                     Owner.PopupMessage(Loc.GetString("metabolism-component-is-shivering"));
                     _isShivering = true;
                 }
 
-                temperatureSystem.ReceiveHeat(Owner.Uid, Math.Min(targetHeat, ShiveringHeatRegulation), temperatureComponent);
+                temperatureSystem.ReceiveHeat(OwnerUid, Math.Min(targetHeat, ShiveringHeatRegulation), temperatureComponent);
             }
         }
 

Content.Shared/ActionBlocker/ActionBlockerSystem.cs

@@ -123,18 +123,14 @@ public bool CanChangeDirection(EntityUid uid)
             return !ev.Cancelled;
         }
 
-        public bool CanShiver(IEntity entity)
+        public bool CanShiver(EntityUid uid)
         {
-            var ev = new ShiverAttemptEvent(entity);
+            var ev = new ShiverAttemptEvent(uid);
+            RaiseLocalEvent(uid, ev);
 
             return !ev.Cancelled;
         }
 
-        public bool CanShiver(EntityUid uid)
-        {
-            return CanShiver(EntityManager.GetEntity(uid));
-        }
-
         public bool CanSweat(IEntity entity)
         {
             var ev = new SweatAttemptEvent(entity);

Content.Shared/Body/Metabolism/ShiverAttemptEvent.cs

@@ -4,11 +4,11 @@ namespace Content.Shared.Body.Metabolism
 {
     public class ShiverAttemptEvent : CancellableEntityEventArgs
     {
-        public ShiverAttemptEvent(IEntity entity)
+        public ShiverAttemptEvent(EntityUid uid)
         {
-            Entity = entity;
+            Uid = uid;
         }
 
-        public IEntity Entity { get; }
+        public EntityUid Uid { get; }
     }
 }