diff --git a/Deliveroo/Deliveroo.csproj b/Deliveroo/Deliveroo.csproj index d2e2f9d..9540a4d 100644 --- a/Deliveroo/Deliveroo.csproj +++ b/Deliveroo/Deliveroo.csproj @@ -1,7 +1,7 @@ net7.0-windows - 2.22 + 2.23 11.0 enable true diff --git a/Deliveroo/DeliverooPlugin.Exchange.cs b/Deliveroo/DeliverooPlugin.Exchange.cs index 3cf8294..2eb9616 100644 --- a/Deliveroo/DeliverooPlugin.Exchange.cs +++ b/Deliveroo/DeliverooPlugin.Exchange.cs @@ -176,7 +176,15 @@ partial class DeliverooPlugin LAddon.IsAddonReady(addonExchange)) { addonExchange->FireCallbackInt(-1); - CurrentStage = Stage.TargetPersonnelOfficer; + + // If we just turned in the final item, there's no need to talk to the personnel officer again + if (_lastTurnInListSize == 1) + { + _turnInWindow.State = false; + CurrentStage = Stage.RequestStop; + } + else + CurrentStage = Stage.TargetPersonnelOfficer; } } } diff --git a/Deliveroo/DeliverooPlugin.Supply.cs b/Deliveroo/DeliverooPlugin.Supply.cs index 5616628..5fd19b5 100644 --- a/Deliveroo/DeliverooPlugin.Supply.cs +++ b/Deliveroo/DeliverooPlugin.Supply.cs @@ -98,7 +98,7 @@ partial class DeliverooPlugin int currentListSize = addonGc->ExpertDeliveryList->ListLength; if (addonGc->ListEmptyTextNode->AtkResNode.IsVisible || currentListSize == 0) { - _pluginLog.Information($"No items to turn in {addonGc->ListEmptyTextNode->AtkResNode.IsVisible}, {currentListSize})"); + _pluginLog.Information($"No items to turn in ({addonGc->ListEmptyTextNode->AtkResNode.IsVisible}, {currentListSize})"); CurrentStage = Stage.CloseGcSupplyThenStop; addon->FireCallbackInt(-1); return;