Missing unsaved changes for previous commit...
This commit is contained in:
@@ -319,11 +319,11 @@ Item* TradeData::GetSpellCastItem() const
|
|||||||
return m_spellCastItem ? m_player->GetItemByGuid(m_spellCastItem) : NULL;
|
return m_spellCastItem ? m_player->GetItemByGuid(m_spellCastItem) : NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void TradeData::SetItem(TradeSlots slot, Item* item, bool update)
|
void TradeData::SetItem(TradeSlots slot, Item* item)
|
||||||
{
|
{
|
||||||
uint64 itemGuid = item ? item->GetGUID() : 0;
|
uint64 itemGuid = item ? item->GetGUID() : 0;
|
||||||
|
|
||||||
if (m_items[slot] == itemGuid && !update)
|
if (m_items[slot] == itemGuid)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_items[slot] = itemGuid;
|
m_items[slot] = itemGuid;
|
||||||
@@ -12818,7 +12818,7 @@ void Player::SplitItem(uint16 src, uint16 dst, uint32 count)
|
|||||||
if (TradeData* tradeData = GetTradeData())
|
if (TradeData* tradeData = GetTradeData())
|
||||||
{
|
{
|
||||||
//! If current item is in trade window (only possible with packet spoofing - silent return)
|
//! If current item is in trade window (only possible with packet spoofing - silent return)
|
||||||
if (GetTradeData()->GetTradeSlotForItem(pSrcItem->GetGUID()) != TRADE_SLOT_INVALID)
|
if (tradeData->GetTradeSlotForItem(pSrcItem->GetGUID()) != TRADE_SLOT_INVALID)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user