Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source
This commit is contained in:
Vincent-Michael
2014-10-02 22:36:58 +02:00
parent 3545d60b7d d828d16e9e
commit caeb933d9e
4 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/2014_10_02_00_world.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `quest_template` SET `SpecialFlags`=1 WHERE `Id` = 11293;

25
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
View File

@@ -235,6 +235,31 @@ void SmartAIMgr::LoadSmartAIFromDB()
}
while (result->NextRow());
// TO-DO: Find better way
for (uint8 i = 0; i < SMART_SCRIPT_TYPE_MAX; i++)
{
for (auto itr = mEventMap[i].begin(); itr != mEventMap[i].end(); ++itr)
{
for (auto e : mEventMap[i][itr->first])
{
bool found = false;
if (e.link && e.link != e.event_id)
{
for (auto linked : mEventMap[i][itr->first])
{
if (linked.event_id == e.link)
if (linked.GetActionType() && linked.GetEventType() == SMART_EVENT_LINK)
found = true;
}
if (!found)
TC_LOG_ERROR("sql.sql", "SmartAIMgr::LoadSmartAIFromDB: Entry %d SourceType %u, Event %u, Link Event %u not found or invalid",
e.entryOrGuid, e.GetScriptType(), e.event_id, e.link);
}
}
}
}
TC_LOG_INFO("server.loading", ">> Loaded %u SmartAI scripts in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
UnLoadHelperStores();

1
src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
View File

@@ -84,6 +84,7 @@ bool AuctionBotSeller::Initialize()
"SELECT `item` FROM `milling_loot_template` UNION "
"SELECT `item` FROM `pickpocketing_loot_template` UNION "
"SELECT `item` FROM `prospecting_loot_template` UNION "
"SELECT `item` FROM `reference_loot_template` UNION "
"SELECT `item` FROM `skinning_loot_template` UNION "
"SELECT `item` FROM `spell_loot_template`");

4
src/server/shared/Threading/ProducerConsumerQueue.h
View File

@@ -82,7 +82,7 @@ public:
void Cancel()
{
_queueLock.lock();
std::unique_lock<std::mutex> lock(_queueLock);
while (!_queue.empty())
{
@@ -95,8 +95,6 @@ public:
_shutdown = true;
_queueLock.unlock();
_condition.notify_all();
}