nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-01 10:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2025-02-19 22:29:36 +08:00
parent d1032678ff
commit 7d431dc796
277 changed files with 7092 additions and 5050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/Loot/LootItemStorage.cpp
View File

@@ -20,6 +20,7 @@
#include "ObjectMgr.h"
#include "PreparedStatement.h"
#include "QueryResult.h"
#include "Timer.h"
LootItemStorage::LootItemStorage()
{
@@ -249,7 +250,7 @@ void LootItemStorage::RemoveStoredLootItem(ObjectGuid containerGUID, uint32 item
// loot with empty itemList but unlootedCount > 0
// must be deleted manually by the player or traded
if (!loot->unlootedCount)
if (!loot->unlootedCount && !loot->gold)
lootItemStore.erase(itr);
}

2
src/server/game/Loot/LootMgr.cpp
View File

@@ -696,7 +696,7 @@ QuestItemList* Loot::FillQuestLoot(Player* player)
{
LootItem& item = quest_items[i];
sScriptMgr->OnBeforeFillQuestLootItem(player, item);
sScriptMgr->OnPlayerBeforeFillQuestLootItem(player, item);
// Quest item is not free for all and is already assigned to another player
// or player doesn't need it