From 2c1e974c89dc9a2bd959d12edfed44ca19ff6bfc Mon Sep 17 00:00:00 2001 From: CWX Date: Sat, 18 Jan 2025 12:59:14 +0000 Subject: [PATCH] use prim ctor and fixed warnings: HideoutCallbacks --- Core/Callbacks/HideoutCallbacks.cs | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/Core/Callbacks/HideoutCallbacks.cs b/Core/Callbacks/HideoutCallbacks.cs index c6fa0bda..9fd70dad 100644 --- a/Core/Callbacks/HideoutCallbacks.cs +++ b/Core/Callbacks/HideoutCallbacks.cs @@ -2,32 +2,20 @@ using Core.Annotations; using Core.Controllers; using Core.DI; using Core.Models.Eft.Common; -using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Hideout; using Core.Models.Eft.ItemEvent; -using Core.Models.Enums; using Core.Models.Spt.Config; using Core.Servers; namespace Core.Callbacks; [Injectable(InjectableTypeOverride = typeof(OnUpdate), TypePriority = OnUpdateOrder.HideoutCallbacks)] -public class HideoutCallbacks : OnUpdate +public class HideoutCallbacks( + HideoutController _hideoutController, + ConfigServer _configServer + ) : OnUpdate { - protected HideoutController _hideoutController; - protected ConfigServer _configServer; - protected HideoutConfig _hideoutConfig; - - public HideoutCallbacks - ( - HideoutController hideoutController, - ConfigServer configServer - ) - { - _hideoutController = hideoutController; - _configServer = configServer; - _hideoutConfig = configServer.GetConfig(); - } + private readonly HideoutConfig _hideoutConfig = _configServer.GetConfig(); /// /// Handle HideoutUpgrade event @@ -172,16 +160,16 @@ public class HideoutCallbacks : OnUpdate return _hideoutController.HideoutCustomizationSetMannequinPose(sessionId, pmcData, request); } - public async Task OnUpdate(long timeSinceLastRun) + public Task OnUpdate(long timeSinceLastRun) { if (timeSinceLastRun > _hideoutConfig.RunIntervalSeconds) { // TODO // _hideoutController.Update(); - return true; + return Task.FromResult(true); } - return false; + return Task.FromResult(false); } public string GetRoute()