diff --git a/RotationSolver.Basic/Actions/BaseItem.cs b/RotationSolver.Basic/Actions/BaseItem.cs index 77e99afa1..1cc48679b 100644 --- a/RotationSolver.Basic/Actions/BaseItem.cs +++ b/RotationSolver.Basic/Actions/BaseItem.cs @@ -12,8 +12,8 @@ internal class BaseItem : IBaseItem public uint AdjustedID => ID; public Func OtherCheck { private get; set; } - private unsafe bool HasIt => InventoryManager.Instance()->GetInventoryItemCount(_item.RowId, false) > 0 || - InventoryManager.Instance()->GetInventoryItemCount(_item.RowId, true) > 0; + private unsafe bool HasIt => InventoryManager.Instance()->GetInventoryItemCount(ID, false) > 0 || + InventoryManager.Instance()->GetInventoryItemCount(ID, true) > 0; public uint IconID { get; } @@ -73,12 +73,12 @@ public BaseItem(uint row, uint a4 = 65535) public unsafe bool CanUse(out IAction item) { item = this; - if (_item == null) return false; if (!Service.Config.UseItem) return false; - if (ConfigurationHelper.BadStatus.Contains(ActionManager.Instance()->GetActionStatus(ActionType.Item, ID))) return false; + if (ConfigurationHelper.BadStatus.Contains(ActionManager.Instance()->GetActionStatus(ActionType.Item, ID)) + && ConfigurationHelper.BadStatus.Contains(ActionManager.Instance()->GetActionStatus(ActionType.Item, ID + 1000000))) return false; var remain = RecastTimeOneCharge - RecastTimeElapsed; @@ -93,12 +93,12 @@ public unsafe bool Use() { if (_item == null) return false; - if (InventoryManager.Instance()->GetInventoryItemCount(_item.RowId, true) > 0) + if (InventoryManager.Instance()->GetInventoryItemCount(ID, true) > 0) { - return ActionManager.Instance()->UseAction(ActionType.Item, _item.RowId + 1000000, Service.Player.ObjectId, A4); + return ActionManager.Instance()->UseAction(ActionType.Item, ID + 1000000, Service.Player.ObjectId, A4); } - return ActionManager.Instance()->UseAction(ActionType.Item, _item.RowId, Service.Player.ObjectId, A4); + return ActionManager.Instance()->UseAction(ActionType.Item, ID, Service.Player.ObjectId, A4); } public override string ToString() => Name;