aboutsummaryrefslogtreecommitdiff
path: root/src/game/Item.cpp
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-03-20 16:42:22 +0100
committerMachiavelli <none@none>2010-03-20 16:42:22 +0100
commitd21f0c3ce857699950b978f33163fc6e7b18a067 (patch)
treefc176362d51e7adb56c29d4f1159c681d4575b97 /src/game/Item.cpp
parenta0d8b0be48ea0419d6014d0a54256f4ef278c860 (diff)
Make sure a to be traded item ends up in the item update queue for the correct player.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Item.cpp')
-rw-r--r--src/game/Item.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/Item.cpp b/src/game/Item.cpp
index 639ec842342..cc19585fcde 100644
--- a/src/game/Item.cpp
+++ b/src/game/Item.cpp
@@ -1069,13 +1069,15 @@ void Item::DeleteRefundDataFromDB()
CharacterDatabase.PExecute("DELETE FROM item_refund_instance WHERE item_guid = '%u'", GetGUIDLow());
}
-void Item::SetNotRefundable(Player *owner)
+void Item::SetNotRefundable(Player *owner, bool changestate)
{
if (!HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_REFUNDABLE))
return;
RemoveFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_REFUNDABLE);
- SetState(ITEM_CHANGED, owner);
+ // Following is not applicable in the trading procedure
+ if (changestate)
+ SetState(ITEM_CHANGED, owner);
SetRefundRecipient(0);
SetPaidMoney(0);