]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
fix build (#20427)
authorKara <lunarautomaton6@gmail.com>
Sat, 23 Sep 2023 10:09:07 +0000 (03:09 -0700)
committerGitHub <noreply@github.com>
Sat, 23 Sep 2023 10:09:07 +0000 (03:09 -0700)
Content.Shared/Actions/SharedActionsSystem.cs
Content.Shared/RatKing/SharedRatKingSystem.cs

index f32e0dd29cab329a82fc2a294a26ce6339304191..86379277e23ed7f3c65fd1db35c3e4645e6e4edf 100644 (file)
@@ -120,8 +120,7 @@ public abstract class SharedActionsSystem : EntitySystem
         if (actionId == null)
             return;
 
-        var action = GetActionData(actionId);
-        if (action == null || action.UseDelay == null)
+        if (!TryGetActionData(actionId, out var action) || action.UseDelay == null)
             return;
 
         action.Cooldown = (GameTiming.CurTime, GameTiming.CurTime + action.UseDelay.Value);
index 2d3981538701fd8ec767ac635e10ad2207400adf..761619dc4adea24eeec90aa9e66c61df29cf156c 100644 (file)
@@ -37,12 +37,12 @@ public abstract class SharedRatKingSystem : EntitySystem
         if (!TryComp(uid, out ActionsComponent? comp))
             return;
 
-        _action.AddAction(uid, ref component.ActionRaiseArmyEntity, component.ActionRaiseArmy, holderComp: comp);
-        _action.AddAction(uid, ref component.ActionDomainEntity, component.ActionDomain, holderComp: comp);
-        _action.AddAction(uid, ref component.ActionOrderStayEntity, component.ActionOrderStay, holderComp: comp);
-        _action.AddAction(uid, ref component.ActionOrderFollowEntity, component.ActionOrderFollow, holderComp: comp);
-        _action.AddAction(uid, ref component.ActionOrderCheeseEmEntity, component.ActionOrderCheeseEm, holderComp: comp);
-        _action.AddAction(uid, ref component.ActionOrderLooseEntity, component.ActionOrderLoose, holderComp: comp);
+        _action.AddAction(uid, ref component.ActionRaiseArmyEntity, component.ActionRaiseArmy, component: comp);
+        _action.AddAction(uid, ref component.ActionDomainEntity, component.ActionDomain, component: comp);
+        _action.AddAction(uid, ref component.ActionOrderStayEntity, component.ActionOrderStay, component: comp);
+        _action.AddAction(uid, ref component.ActionOrderFollowEntity, component.ActionOrderFollow, component: comp);
+        _action.AddAction(uid, ref component.ActionOrderCheeseEmEntity, component.ActionOrderCheeseEm, component: comp);
+        _action.AddAction(uid, ref component.ActionOrderLooseEntity, component.ActionOrderLoose, component: comp);
 
         UpdateActions(uid, component);
     }