erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(inventory): complete switches on wield response

Browse source 
Clear retail AutoWield on the matching authoritative WieldObject instead of waiting for unrelated rollback bookkeeping to drain. This prevents a completed switch from consuming the next weapon activation locally, including crossbows.

Co-Authored-By: Codex <codex@openai.com>
This commit is contained in:
Erik 2026-07-13 09:00:54 +02:00
parent ea5cf5b842
commit 3e84027885
9 changed files with 47 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/AcDream.App/UI/AutoWieldController.cs
View file

@ -84,7 +84,7 @@ internal sealed class AutoWieldController : IDisposable
_objects.ObjectMoved += OnObjectMoved;
_objects.ObjectRemoved += OnObjectRemoved;
_objects.MoveRequestFailed += OnMoveRequestFailed;
_objects.MoveRequestConfirmed += OnMoveRequestConfirmed;
_objects.WieldConfirmed += OnWieldConfirmed;
_objects.Cleared += OnObjectsCleared;
}
@ -191,7 +191,7 @@ internal sealed class AutoWieldController : IDisposable
TryWield(requested);
}
private void OnMoveRequestConfirmed(ClientObject item)
private void OnWieldConfirmed(ClientObject item)
{
if (_pendingSwitch is { BlockingItemId: 0 } pending
&& item.ObjectId == pending.RequestedItemId)
@ -319,7 +319,7 @@ internal sealed class AutoWieldController : IDisposable
_objects.ObjectMoved -= OnObjectMoved;
_objects.ObjectRemoved -= OnObjectRemoved;
_objects.MoveRequestFailed -= OnMoveRequestFailed;
_objects.MoveRequestConfirmed -= OnMoveRequestConfirmed;
_objects.WieldConfirmed -= OnWieldConfirmed;
_objects.Cleared -= OnObjectsCleared;
}