diff options
author | Machiavelli <machiavelli.trinity@gmail.com> | 2012-01-18 19:00:52 +0100 |
---|---|---|
committer | Machiavelli <machiavelli.trinity@gmail.com> | 2012-01-18 19:00:52 +0100 |
commit | e652d9043ba7c4c2b1b159eccc1e09c0c0c9bf55 (patch) | |
tree | 170a5d2751e73ca05a3e2db888fa100649f3415d /src | |
parent | 46dda033c8b5abe45286ac94c4c727e57710ded3 (diff) |
Missing unsaved changes for previous commit...
Diffstat (limited to 'src')
-rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |