This commit is contained in:
Kara
2023-09-23 03:09:07 -07:00
committed by GitHub
parent 684b334806
commit 9b55fbd0be
2 changed files with 7 additions and 8 deletions

View File

@@ -120,8 +120,7 @@ public abstract class SharedActionsSystem : EntitySystem
if (actionId == null) if (actionId == null)
return; return;
var action = GetActionData(actionId); if (!TryGetActionData(actionId, out var action) || action.UseDelay == null)
if (action == null || action.UseDelay == null)
return; return;
action.Cooldown = (GameTiming.CurTime, GameTiming.CurTime + action.UseDelay.Value); action.Cooldown = (GameTiming.CurTime, GameTiming.CurTime + action.UseDelay.Value);

View File

@@ -37,12 +37,12 @@ public abstract class SharedRatKingSystem : EntitySystem
if (!TryComp(uid, out ActionsComponent? comp)) if (!TryComp(uid, out ActionsComponent? comp))
return; return;
_action.AddAction(uid, ref component.ActionRaiseArmyEntity, component.ActionRaiseArmy, holderComp: comp); _action.AddAction(uid, ref component.ActionRaiseArmyEntity, component.ActionRaiseArmy, component: comp);
_action.AddAction(uid, ref component.ActionDomainEntity, component.ActionDomain, holderComp: comp); _action.AddAction(uid, ref component.ActionDomainEntity, component.ActionDomain, component: comp);
_action.AddAction(uid, ref component.ActionOrderStayEntity, component.ActionOrderStay, holderComp: comp); _action.AddAction(uid, ref component.ActionOrderStayEntity, component.ActionOrderStay, component: comp);
_action.AddAction(uid, ref component.ActionOrderFollowEntity, component.ActionOrderFollow, holderComp: comp); _action.AddAction(uid, ref component.ActionOrderFollowEntity, component.ActionOrderFollow, component: comp);
_action.AddAction(uid, ref component.ActionOrderCheeseEmEntity, component.ActionOrderCheeseEm, holderComp: comp); _action.AddAction(uid, ref component.ActionOrderCheeseEmEntity, component.ActionOrderCheeseEm, component: comp);
_action.AddAction(uid, ref component.ActionOrderLooseEntity, component.ActionOrderLoose, holderComp: comp); _action.AddAction(uid, ref component.ActionOrderLooseEntity, component.ActionOrderLoose, component: comp);
UpdateActions(uid, component); UpdateActions(uid, component);
} }