Lelia
/
ARDiscard
forked from liza/ARDiscard
1
0
Fork 0
Code Pull Requests Activity

Cancel discard if no server response received after 15s

master
Liza 2023-09-10 14:19:09 +02:00
parent 03a79baaa2
commit d6155e403e
Signed by: liza
GPG Key ID: 7199F8D727D55F67
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ARDiscard/AutoDiscardPlogon.cs
View File

@ -33,6 +33,8 @@ public class AutoDiscardPlogon : IDalamudPlugin
private readonly AutoRetainerApi _autoRetainerApi; private readonly AutoRetainerApi _autoRetainerApi;
private readonly TaskManager _taskManager; private readonly TaskManager _taskManager;
private DateTime _cancelDiscardAfter = DateTime.MaxValue;
public AutoDiscardPlogon(DalamudPluginInterface pluginInterface, CommandManager commandManager, ChatGui chatGui, public AutoDiscardPlogon(DalamudPluginInterface pluginInterface, CommandManager commandManager, ChatGui chatGui,
DataManager dataManager, ClientState clientState) DataManager dataManager, ClientState clientState)
{ {
@ -117,6 +119,7 @@ public class AutoDiscardPlogon : IDalamudPlugin
PluginLog.Information( PluginLog.Information(
$"Discarding itemId {nextItem->ItemID} in slot {nextItem->Slot} of container {nextItem->Container}."); $"Discarding itemId {nextItem->ItemID} in slot {nextItem->Slot} of container {nextItem->Container}.");
_inventoryUtils.Discard(nextItem); _inventoryUtils.Discard(nextItem);
_cancelDiscardAfter = DateTime.Now.AddSeconds(15);
_taskManager.DelayNext(20); _taskManager.DelayNext(20);
_taskManager.Enqueue(() => ConfirmDiscardItem(finishRetainerAction, inventoryType, slot)); _taskManager.Enqueue(() => ConfirmDiscardItem(finishRetainerAction, inventoryType, slot));
@ -176,9 +179,20 @@ public class AutoDiscardPlogon : IDalamudPlugin
} }
else if (nextItem->Container == inventoryType && nextItem->Slot == slot) else if (nextItem->Container == inventoryType && nextItem->Slot == slot)
{ {
PluginLog.Information($"ContinueAfterDiscard: Waiting for server response"); if (_cancelDiscardAfter < DateTime.Now)
_taskManager.DelayNext(20); {
_taskManager.Enqueue(() => ContinueAfterDiscard(finishRetainerAction, inventoryType, slot)); PluginLog.Information("No longer waiting for plugin to pop up, assume discard failed");
if (finishRetainerAction)
_autoRetainerApi.FinishPostProcess();
else
_chatGui.PrintError("Discarding probably failed due to an error.");
}
else
{
PluginLog.Information($"ContinueAfterDiscard: Waiting for server response until {_cancelDiscardAfter}");
_taskManager.DelayNext(20);
_taskManager.Enqueue(() => ContinueAfterDiscard(finishRetainerAction, inventoryType, slot));
}
} }
else else
{ {