From c4eb1f84393568479596ee5f716b8e6392031eac Mon Sep 17 00:00:00 2001 From: Paul Coene Date: Sun, 6 Mar 2022 21:15:22 -0500 Subject: [PATCH] [Bug Fix] Bandolier didn't recognize source weapon on cursor (#2026) * [Bug Fix] Bandolier didn't recognize source weapon on cursor * Add TODO comment --- zone/inventory.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 83927bbfe..b608e19f6 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -3332,8 +3332,11 @@ void Client::SetBandolier(const EQApplicationPacket *app) // removed 'invWhereCursor' argument from above and implemented slots 30, 331-340 checks here if (slot == INVALID_INDEX) { if (m_inv.GetItem(EQ::invslot::slotCursor)) { - if (m_inv.GetItem(EQ::invslot::slotCursor)->GetItem()->ID == m_pp.bandoliers[bss->Number].Items[BandolierSlot].ID && - m_inv.GetItem(EQ::invslot::slotCursor)->GetCharges() >= 1) { // '> 0' the same, but this matches Inventory::_HasItem conditional check + // Below used to check charges but for some reason + // m_inv.GetItem(EQ::invslot::slotCursor)->GetCharges() + // is returning 0. We know it exists, so removed check. + // TODO: Why is 0 being returned for slotCursor. + if (m_inv.GetItem(EQ::invslot::slotCursor)->GetItem()->ID == m_pp.bandoliers[bss->Number].Items[BandolierSlot].ID) { slot = EQ::invslot::slotCursor; } else if (m_inv.GetItem(EQ::invslot::slotCursor)->GetItem()->ItemClass == 1) {