1. diff --git a/src/game/Player.cpp b/src/game/Player.cpp
  2. index a73de9b..dcc71a3 100644
  3. --- a/src/game/Player.cpp
  4. +++ b/src/game/Player.cpp
  5. @@ -11177,7 +11177,7 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
  6. else if (Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag ))
  7. {
  8. pBag->StoreItem( slot, pItem, update );
  9. - if( IsInWorld() && update )
  10. + if (IsInWorld() && update)
  11. {
  12. pItem->AddToWorld();
  13. pItem->SendCreateUpdateToPlayer( this );
  14. @@ -11293,7 +11293,7 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
  15. }
  16. }
  18. - if( IsInWorld() && update )
  19. + if (IsInWorld() && update)
  20. {
  21. pItem->AddToWorld();
  22. pItem->SendCreateUpdateToPlayer( this );
  23. @@ -11315,12 +11315,12 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
  24. else
  25. {
  26. pItem2->SetCount( pItem2->GetCount() + pItem->GetCount() );
  27. - if( IsInWorld() && update )
  28. + if (IsInWorld() && update)
  29. pItem2->SendCreateUpdateToPlayer( this );
  31. // delete item (it not in any slot currently)
  32. //pItem->DeleteFromDB();
  33. - if( IsInWorld() && update )
  34. + if (IsInWorld() && update)
  35. {
  36. pItem->RemoveFromWorld();
  37. pItem->DestroyForPlayer( this );
  38. @@ -11618,7 +11618,7 @@ void Player::DestroyItem( uint8 bag, uint8 slot, bool update )
  39. else if(Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag ))
  40. pBag->RemoveItem(slot, update);
  42. - if( IsInWorld() && update )
  43. + if (IsInWorld() && update)
  44. {
  45. pItem->RemoveFromWorld();
  46. pItem->DestroyForPlayer(this);
  47. @@ -11631,15 +11631,15 @@ void Player::DestroyItem( uint8 bag, uint8 slot, bool update )
  48. }
  49. }
  51. -void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool unequip_check)
  52. +void Player::DestroyItemCount(uint32 item, uint32 count, bool update, bool unequip_check, bool inBankAlso)
  53. {
  54. - DEBUG_LOG( "STORAGE: DestroyItemCount item = %u, count = %u", item, count);
  55. + DEBUG_LOG("STORAGE: DestroyItemCount item = %u, count = %u", item, count);
  56. uint32 remcount = 0;
  58. // in inventory
  59. - for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
  60. + for (int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
  61. {
  62. - if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
  63. + if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
  64. {
  65. if (pItem->GetEntry() == item && !pItem->IsInTrade())
  66. {
  67. @@ -11647,17 +11647,17 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
  68. {
  69. // all items in inventory can unequipped
  70. remcount += pItem->GetCount();
  71. - DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
  72. + DestroyItem(INVENTORY_SLOT_BAG_0, i, update);
  74. if (remcount >= count)
  75. return;
  76. }
  77. else
  78. {
  79. - ItemRemovedQuestCheck( pItem->GetEntry(), count - remcount );
  80. - pItem->SetCount( pItem->GetCount() - count + remcount );
  81. - if (IsInWorld() & update)
  82. - pItem->SendCreateUpdateToPlayer( this );
  83. + ItemRemovedQuestCheck(pItem->GetEntry(), count - remcount);
  84. + pItem->SetCount(pItem->GetCount() - count + remcount);
  85. + if (IsInWorld() && update)
  86. + pItem->SendCreateUpdateToPlayer(this);
  87. pItem->SetState(ITEM_CHANGED, this);
  88. return;
  89. }
  90. @@ -11665,9 +11665,9 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
  91. }
  92. }
  94. - for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
  95. + for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
  96. {
  97. - if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
  98. + if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
  99. {
  100. if (pItem->GetEntry() == item && !pItem->IsInTrade())
  101. {
  102. @@ -11675,17 +11675,17 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
  103. {
  104. // all keys can be unequipped
  105. remcount += pItem->GetCount();
  106. - DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
  107. + DestroyItem(INVENTORY_SLOT_BAG_0, i, update);
  109. if (remcount >= count)
  110. return;
  111. }
  112. else
  113. {
  114. - ItemRemovedQuestCheck( pItem->GetEntry(), count - remcount );
  115. - pItem->SetCount( pItem->GetCount() - count + remcount );
  116. - if (IsInWorld() & update)
  117. - pItem->SendCreateUpdateToPlayer( this );
  118. + ItemRemovedQuestCheck(pItem->GetEntry(), count - remcount);
  119. + pItem->SetCount(pItem->GetCount() - count + remcount);
  120. + if (IsInWorld() && update)
  121. + pItem->SendCreateUpdateToPlayer(this);
  122. pItem->SetState(ITEM_CHANGED, this);
  123. return;
  124. }
  125. @@ -11694,13 +11694,13 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
  126. }
  128. // in inventory bags
  129. - for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
  130. + for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
  131. {
  132. - if(Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
  133. + if (Bag *pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
  134. {
  135. - for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
  136. + for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
  137. {
  138. - if(Item* pItem = pBag->GetItemByPos(j))
  139. + if (Item* pItem = pBag->GetItemByPos(j))
  140. {
  141. if (pItem->GetEntry() == item && !pItem->IsInTrade())
  142. {
  143. @@ -11708,17 +11708,17 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
  144. if (pItem->GetCount() + remcount <= count)
  145. {
  146. remcount += pItem->GetCount();
  147. - DestroyItem( i, j, update );
  148. + DestroyItem(i, j, update);
  150. if (remcount >= count)
  151. return;
  152. }
  153. else
  154. {
  155. - ItemRemovedQuestCheck( pItem->GetEntry(), count - remcount );
  156. - pItem->SetCount( pItem->GetCount() - count + remcount );
  157. + ItemRemovedQuestCheck(pItem->GetEntry(), count - remcount);
  158. + pItem->SetCount(pItem->GetCount() - count + remcount);
  159. if (IsInWorld() && update)
  160. - pItem->SendCreateUpdateToPlayer( this );
  161. + pItem->SendCreateUpdateToPlayer(this);
  162. pItem->SetState(ITEM_CHANGED, this);
  163. return;
  164. }
  165. @@ -11729,18 +11729,18 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
  166. }
  168. // in equipment and bag list
  169. - for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; ++i)
  170. + for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; ++i)
  171. {
  172. - if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
  173. + if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
  174. {
  175. if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
  176. {
  177. if (pItem->GetCount() + remcount <= count)
  178. {
  179. - if (!unequip_check || CanUnequipItem(INVENTORY_SLOT_BAG_0 << 8 | i, false) == EQUIP_ERR_OK )
  180. + if (!unequip_check || CanUnequipItem(INVENTORY_SLOT_BAG_0 << 8 | i, false) == EQUIP_ERR_OK)
  181. {
  182. remcount += pItem->GetCount();
  183. - DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
  184. + DestroyItem(INVENTORY_SLOT_BAG_0, i, update);
  186. if (remcount >= count)
  187. return;
  188. @@ -11748,16 +11748,80 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
  189. }
  190. else
  191. {
  192. - ItemRemovedQuestCheck( pItem->GetEntry(), count - remcount );
  193. - pItem->SetCount( pItem->GetCount() - count + remcount );
  194. - if (IsInWorld() & update)
  195. - pItem->SendCreateUpdateToPlayer( this );
  196. + ItemRemovedQuestCheck(pItem->GetEntry(), count - remcount);
  197. + pItem->SetCount(pItem->GetCount() - count + remcount);
  198. + if (IsInWorld() && update)
  199. + pItem->SendCreateUpdateToPlayer(this);
  200. pItem->SetState(ITEM_CHANGED, this);
  201. return;
  202. }
  203. }
  204. }
  205. }
  206. +
  207. + if (inBankAlso)
  208. + {
  209. + // in bank
  210. + for (int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
  211. + {
  212. + if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
  213. + {
  214. + if (pItem->GetEntry() == item && !pItem->IsInTrade())
  215. + {
  216. + if (pItem->GetCount() + remcount <= count)
  217. + {
  218. + remcount += pItem->GetCount();
  219. + DestroyItem(INVENTORY_SLOT_BAG_0, i, update);
  220. +
  221. + if (remcount >= count)
  222. + return;
  223. + }
  224. + else
  225. + {
  226. + ItemRemovedQuestCheck(pItem->GetEntry(), count - remcount);
  227. + pItem->SetCount(pItem->GetCount() - count + remcount);
  228. + if (IsInWorld() && update)
  229. + pItem->SendCreateUpdateToPlayer(this);
  230. + pItem->SetState(ITEM_CHANGED, this);
  231. + return;
  232. + }
  233. + }
  234. + }
  235. + }
  236. +
  237. + for (int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
  238. + {
  239. + if (Bag *pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
  240. + {
  241. + for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
  242. + {
  243. + if (Item* pItem = pBag->GetItemByPos(j))
  244. + {
  245. + if (pItem->GetEntry() == item && !pItem->IsInTrade())
  246. + {
  247. + if (pItem->GetCount() + remcount <= count)
  248. + {
  249. + remcount += pItem->GetCount();
  250. + DestroyItem(i, j, update);
  251. +
  252. + if (remcount >= count)
  253. + return;
  254. + }
  255. + else
  256. + {
  257. + ItemRemovedQuestCheck(pItem->GetEntry(), count - remcount);
  258. + pItem->SetCount(pItem->GetCount() - count + remcount);
  259. + if (IsInWorld() && update)
  260. + pItem->SendCreateUpdateToPlayer(this);
  261. + pItem->SetState(ITEM_CHANGED, this);
  262. + return;
  263. + }
  264. + }
  265. + }
  266. + }
  267. + }
  268. + }
  269. + }
  270. }
  272. void Player::DestroyZoneLimitedItem( bool update, uint32 new_zone )
  273. @@ -11835,7 +11899,7 @@ void Player::DestroyItemCount( Item* pItem, uint32 &count, bool update )
  274. ItemRemovedQuestCheck( pItem->GetEntry(), count);
  275. pItem->SetCount( pItem->GetCount() - count );
  276. count = 0;
  277. - if( IsInWorld() & update )
  278. + if (IsInWorld() && update)
  279. pItem->SendCreateUpdateToPlayer( this );
  280. pItem->SetState(ITEM_CHANGED, this);
  281. }
  282. @@ -13958,12 +14022,22 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
  283. {
  284. uint32 quest_id = pQuest->GetQuestId();
  286. - for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i )
  287. + for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
  288. {
  289. if (pQuest->ReqItemId[i])
  290. DestroyItemCount(pQuest->ReqItemId[i], pQuest->ReqItemCount[i], true);
  291. }
  293. + for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
  294. + {
  295. + if (pQuest->ReqSourceId[i])
  296. + {
  297. + ItemPrototype const* iProto = ObjectMgr::GetItemPrototype(pQuest->ReqSourceId[i]);
  298. + if (iProto && iProto->Bonding == BIND_QUEST_ITEM)
  299. + DestroyItemCount(pQuest->ReqSourceId[i], pQuest->ReqSourceCount[i], true, false, true);
  300. + }
  301. + }
  302. +
  303. RemoveTimedQuest(quest_id);
  305. if (BattleGround* bg = GetBattleGround())
  306. @@ -23200,4 +23274,4 @@ void Player::_fillGearScoreData(Item* item, GearScoreVec* gearScore, uint32& two
  307. default:
  308. break;
  309. }
  310. -}
  311. +}
  312. \ No newline at end of file
  313. diff --git a/src/game/Player.h b/src/game/Player.h
  314. index 5b2e8ec..8fa5fb4 100644
  315. --- a/src/game/Player.h
  316. +++ b/src/game/Player.h
  317. @@ -1240,7 +1240,7 @@ class MANGOS_DLL_SPEC Player : public Unit
  318. // in trade, guild bank, mail....
  319. void RemoveItemDependentAurasAndCasts( Item * pItem );
  320. void DestroyItem( uint8 bag, uint8 slot, bool update );
  321. - void DestroyItemCount( uint32 item, uint32 count, bool update, bool unequip_check = false);
  322. + void DestroyItemCount(uint32 item, uint32 count, bool update, bool unequip_check = false, bool inBankAlso = false);
  323. void DestroyItemCount( Item* item, uint32& count, bool update );
  324. void DestroyConjuredItems( bool update );
  325. void DestroyZoneLimitedItem( bool update, uint32 new_zone );
  326. @@ -1342,7 +1342,7 @@ class MANGOS_DLL_SPEC Player : public Unit
  327. void AddQuest( Quest const *pQuest, Object *questGiver );
  328. void CompleteQuest( uint32 quest_id );
  329. void IncompleteQuest( uint32 quest_id );
  330. - void RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver, bool announce = true );
  331. + void RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver, bool announce = true);
  333. void FailQuest( uint32 quest_id );
  334. bool SatisfyQuestSkill(Quest const* qInfo, bool msg) const;
  335. diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp
  336. index 88536e1..df2fcfa 100644
  337. --- a/src/game/QuestHandler.cpp
  338. +++ b/src/game/QuestHandler.cpp
  339. @@ -320,22 +320,30 @@ void WorldSession::HandleQuestLogRemoveQuest(WorldPacket& recv_data)
  340. uint8 slot;
  341. recv_data >> slot;
  343. - DEBUG_LOG( "WORLD: Received CMSG_QUESTLOG_REMOVE_QUEST slot = %u",slot );
  344. + DEBUG_LOG("WORLD: Received CMSG_QUESTLOG_REMOVE_QUEST slot = %u",slot);
  346. - if( slot < MAX_QUEST_LOG_SIZE )
  347. + if (slot < MAX_QUEST_LOG_SIZE)
  348. {
  349. - if(uint32 quest = _player->GetQuestSlotQuestId(slot))
  350. + if (uint32 quest = _player->GetQuestSlotQuestId(slot))
  351. {
  352. - if(!_player->TakeQuestSourceItem( quest, true ))
  353. + if (!_player->TakeQuestSourceItem(quest, true))
  354. return; // can't un-equip some items, reject quest cancel
  356. - if (const Quest *pQuest = sObjectMgr.GetQuestTemplate(quest))
  357. + const Quest *pQuest = sObjectMgr.GetQuestTemplate(quest);
  358. + if (pQuest->HasSpecialFlag(QUEST_SPECIAL_FLAG_TIMED))
  359. + _player->RemoveTimedQuest(quest);
  360. +
  361. + for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
  362. {
  363. - if (pQuest->HasSpecialFlag(QUEST_SPECIAL_FLAG_TIMED))
  364. - _player->RemoveTimedQuest(quest);
  365. + if (pQuest->ReqSourceId[i])
  366. + {
  367. + ItemPrototype const* iProto = ObjectMgr::GetItemPrototype(pQuest->ReqSourceId[i]);
  368. + if (iProto && iProto->Bonding == BIND_QUEST_ITEM)
  369. + _player->DestroyItemCount(pQuest->ReqSourceId[i], pQuest->ReqSourceCount[i], true, false, true);
  370. + }
  371. }
  373. - _player->SetQuestStatus( quest, QUEST_STATUS_NONE);
  374. + _player->SetQuestStatus(quest, QUEST_STATUS_NONE);
  375. }
  377. _player->SetQuestSlot(slot, 0);

REMOVE_REQ_SOURCE_ITEM