diff --git a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs index 2916474724..f909842264 100644 --- a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs +++ b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs @@ -35,7 +35,7 @@ namespace Content.Server.AI.Operators.Inventory return Outcome.Failed; } - if (!container.Owner.TryGetComponent(out EntityStorageComponent storageComponent) || + if (!container.Owner.TryGetComponent(out EntityStorageComponent? storageComponent) || storageComponent.IsWeldedShut) { return Outcome.Failed; diff --git a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs index a31042b2af..d6631a41d7 100644 --- a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs +++ b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs @@ -31,7 +31,7 @@ namespace Content.Server.AI.Operators.Inventory return Outcome.Failed; } - if (!_owner.TryGetComponent(out HandsComponent handsComponent)) + if (!_owner.TryGetComponent(out HandsComponent? handsComponent)) { return Outcome.Failed; } diff --git a/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs b/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs index 7f35892984..1be054733d 100644 --- a/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs +++ b/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs @@ -22,12 +22,12 @@ namespace Content.Server.AI.Operators.Inventory public override Outcome Execute(float frameTime) { // TODO: Also have this check storage a la backpack etc. - if (!_owner.TryGetComponent(out HandsComponent handsComponent)) + if (!_owner.TryGetComponent(out HandsComponent? handsComponent)) { return Outcome.Failed; } - if (!_target.TryGetComponent(out ItemComponent itemComponent)) + if (!_target.TryGetComponent(out ItemComponent? itemComponent)) { return Outcome.Failed; } diff --git a/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs b/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs index 366197a2fd..7388ee13b4 100644 --- a/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs +++ b/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs @@ -21,7 +21,7 @@ namespace Content.Server.AI.Operators.Nutrition _owner = owner; _target = target; } - + public override Outcome Execute(float frameTime) { if (_interactionCooldown >= 0) @@ -29,11 +29,11 @@ namespace Content.Server.AI.Operators.Nutrition _interactionCooldown -= frameTime; return Outcome.Continuing; } - + // TODO: Also have this check storage a la backpack etc. - if (_target.Deleted || - !_owner.TryGetComponent(out HandsComponent handsComponent) || - !_target.TryGetComponent(out ItemComponent itemComponent)) + if (_target.Deleted || + !_owner.TryGetComponent(out HandsComponent? handsComponent) || + !_target.TryGetComponent(out ItemComponent? itemComponent)) { return Outcome.Failed; } @@ -58,10 +58,10 @@ namespace Content.Server.AI.Operators.Nutrition { return Outcome.Failed; } - - if (drinkComponent.Deleted || - drinkComponent.Empty || - _owner.TryGetComponent(out ThirstComponent thirstComponent) && + + if (drinkComponent.Deleted || + drinkComponent.Empty || + _owner.TryGetComponent(out ThirstComponent? thirstComponent) && thirstComponent.CurrentThirst >= thirstComponent.ThirstThresholds[ThirstThreshold.Okay]) { return Outcome.Success; @@ -70,4 +70,4 @@ namespace Content.Server.AI.Operators.Nutrition return Outcome.Continuing; } } -} \ No newline at end of file +} diff --git a/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs b/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs index 7814a42d7e..27f74d92c4 100644 --- a/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs +++ b/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs @@ -29,11 +29,11 @@ namespace Content.Server.AI.Operators.Nutrition _interactionCooldown -= frameTime; return Outcome.Continuing; } - + // TODO: Also have this check storage a la backpack etc. - if (_target.Deleted || - !_owner.TryGetComponent(out HandsComponent handsComponent) || - !_target.TryGetComponent(out ItemComponent itemComponent)) + if (_target.Deleted || + !_owner.TryGetComponent(out HandsComponent? handsComponent) || + !_target.TryGetComponent(out ItemComponent? itemComponent)) { return Outcome.Failed; } @@ -58,10 +58,10 @@ namespace Content.Server.AI.Operators.Nutrition { return Outcome.Failed; } - - if (_target.Deleted || - foodComponent.UsesRemaining == 0 || - _owner.TryGetComponent(out HungerComponent hungerComponent) && + + if (_target.Deleted || + foodComponent.UsesRemaining == 0 || + _owner.TryGetComponent(out HungerComponent? hungerComponent) && hungerComponent.CurrentHunger >= hungerComponent.HungerThresholds[HungerThreshold.Okay]) { return Outcome.Success; @@ -70,4 +70,4 @@ namespace Content.Server.AI.Operators.Nutrition return Outcome.Continuing; } } -} \ No newline at end of file +}