Make sure a to be traded item ends up in the item update queue for the correct player.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/TradeHandler.cpp b/src/game/TradeHandler.cpp
index d64b2f04d2f..23800b81aed 100644
--- a/src/game/TradeHandler.cpp
+++ b/src/game/TradeHandler.cpp
@@ -371,16 +371,16 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
             if (myItems[i])
             {
                 myItems[i]->SetUInt64Value( ITEM_FIELD_GIFTCREATOR, _player->GetGUID());
+                myItems[i]->SetNotRefundable(_player, false);
                 iPtr = _player->GetItemByGuid(_player->tradeItems[i]);
                 _player->MoveItemFromInventory(iPtr->GetBagSlot(), iPtr->GetSlot(), true);
-                myItems[i]->SetNotRefundable(_player);
             }
             if (hisItems[i])
             {
                 hisItems[i]->SetUInt64Value( ITEM_FIELD_GIFTCREATOR,_player->pTrader->GetGUID());
+                hisItems[i]->SetNotRefundable(_player->pTrader, false);
                 iPtr = _player->pTrader->GetItemByGuid(_player->pTrader->tradeItems[i]);
                 _player->pTrader->MoveItemFromInventory(iPtr->GetBagSlot(), iPtr->GetSlot(), true);
-                hisItems[i]->SetNotRefundable(_player->pTrader);
             }
         }