Merge pull request #10039 from sruon/state_fix

[core] Decrement equipped ammo / Send item packet update on craft fail

Author: Xaver-DaRed

scripts/tests/systems/items/equip.lua

@@ -87,6 +87,17 @@ describe('Equipment', function()
         assert(player:getEquippedItem(xi.slot.MAIN) == nil)
     end)
 
+    it('equipped ammo stack decrements on use', function()
+        player:addItem(xi.item.FIRE_ARROW, 50)
+        player:equipItem(xi.item.FIRE_ARROW, nil, xi.slot.AMMO)
+
+        player:delItem(xi.item.FIRE_ARROW, 1)
+
+        local ammo = player:getEquippedItem(xi.slot.AMMO)
+        assert(ammo)
+        assert(ammo:getQuantity() == 49)
+    end)
+
     it('all visible armor slots accept their piece', function()
         local pieces =
         {

src/map/ai/states/item_state.cpp

@@ -119,7 +119,7 @@ CItemState::CItemState(CCharEntity* PEntity, const uint16 targid, const uint8 lo
     m_PEntity->UContainer->SetType(UCONTAINER_USEITEM);
     m_PEntity->UContainer->SetItem(0, m_PItem);
 
-    tx_             = ItemUseTransaction::start(m_PEntity, m_PItem);
+    tx_             = m_PEntity->addTransaction(ItemUseTransaction::start(m_PEntity, m_PItem));
     m_startPos      = m_PEntity->loc.p;
     m_castTime      = m_PItem->getActivationTime();
     m_animationTime = m_PItem->getAnimationTime();
@@ -241,13 +241,9 @@ void CItemState::Cleanup(timer::time_point tick)
 {
     m_PEntity->UContainer->Clean();
 
-    // Clear InTransaction before the ITEM_LIST packet below.
-    if (m_interrupted || !IsCompleted())
+    if (tx_ && tx_->isOpen())
     {
-        if (tx_)
-        {
-            tx_->rollback();
-        }
+        tx_->rollback();
     }
 
     if (m_PItem && (m_interrupted || !IsCompleted()) && !m_PItem->isType(ITEM_EQUIPMENT))

src/map/ai/states/item_state.h

@@ -23,8 +23,6 @@
 
 #include "state.h"
 
-#include <memory>
-
 class CBattleEntity;
 class CCharEntity;
 class CItemUsable;
@@ -62,14 +60,14 @@ class CItemState : public CState
 protected:
     bool HasMoved() const;
 
-    CCharEntity*                        m_PEntity;
-    CItemUsable*                        m_PItem;
-    uint8                               m_location;
-    uint8                               m_slot;
-    timer::duration                     m_castTime{};
-    timer::duration                     m_animationTime{};
-    position_t                          m_startPos;
-    bool                                m_interrupted{ false };
-    bool                                m_interruptable{ true };
-    std::unique_ptr<ItemUseTransaction> tx_;
+    CCharEntity*        m_PEntity;
+    CItemUsable*        m_PItem;
+    uint8               m_location;
+    uint8               m_slot;
+    timer::duration     m_castTime{};
+    timer::duration     m_animationTime{};
+    position_t          m_startPos;
+    bool                m_interrupted{ false };
+    bool                m_interruptable{ true };
+    ItemUseTransaction* tx_{ nullptr };
 };

src/map/items/transactions/synth.cpp

@@ -251,6 +251,7 @@ void SynthTransaction::releaseAllClaims()
         {
             exitTx(item);
             item->setSubType(ITEM_UNLOCKED);
+            this->player_->pushPacket<GP_SERV_COMMAND_ITEM_LIST>(item, ItemLockFlg::Normal);
         }
 
         this->slots_[i].item = nullptr;

src/map/utils/charutils.cpp

@@ -1933,7 +1933,10 @@ uint32 UpdateItem(CCharEntity* PChar, uint8 LocationID, uint8 slotID, int32 quan
         }
     }
 
-    if (PItem->isBusy() && !force)
+    // Equipped ammo decrements its stack on consumption without leaving the slot.
+    const bool isEquippedAmmo = PItem->state() == ItemState::Equipped &&
+                                PChar->getEquip(SLOT_AMMO) == PItem;
+    if (PItem->isBusy() && !isEquippedAmmo && !force)
     {
         ShowWarningFmt("UpdateItem: refusing to mutate busy item {} in state {} (loc={}, slot={}, char={})",
                        ItemID,