Merge branch 'fixes'

feature/prepare-cross-merge
Nuno 4 years ago committed by kaetemi
parent 5678ef1727
commit 7f33e9bdd6
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -87,6 +87,10 @@ bool CExchangeView::putItemInExchange(uint32 bagSlot, uint32 exchangeSlot, uint3
if (!item->getMovable() && _InterlocutorView != NULL && form->Family != ITEMFAMILY::PET_ANIMAL_TICKET && (!form->DropOrSell || item->getUnMovable()))
return false;
// pet animal ticket must be exchangeable only if shardExchangeable
if (form->Family == ITEMFAMILY::PET_ANIMAL_TICKET && !form->ShardExchangeable)
return false;
// Can't trade items locked by owner
if (item->getLockedByOwner())
return false;

Loading…
Cancel
Save