From e652d9043ba7c4c2b1b159eccc1e09c0c0c9bf55 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Wed, 18 Jan 2012 19:00:52 +0100 Subject: Missing unsaved changes for previous commit... --- src/server/game/Entities/Player/Player.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index ddd1cdc8849..ce80d7a7af3 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -319,11 +319,11 @@ Item* TradeData::GetSpellCastItem() const 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; - if (m_items[slot] == itemGuid && !update) + if (m_items[slot] == itemGuid) return; m_items[slot] = itemGuid; @@ -12818,7 +12818,7 @@ void Player::SplitItem(uint16 src, uint16 dst, uint32 count) if (TradeData* tradeData = GetTradeData()) { //! 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; } -- cgit v1.2.3