nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-26 15:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk

Browse Source
This commit is contained in:
Yehonal
2016-08-23 14:23:53 +02:00
parent 5fa9ed6f28 7117af1d70
commit a04f5a0798
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
data/sql/updates/world/2016_08_19_01.sql Normal file
View File

@@ -0,0 +1,24 @@
ALTER TABLE world_db_version CHANGE COLUMN 2016_08_19_00 2016_08_19_01 BIT;
/*
Issue: Not work quest id 11543 #93
Missing SAI for the correct execution of quest
Create SAI for ending quest
*/
UPDATE creature_template SET AIName="SmartAI" WHERE entry IN (25090,25091,25092);
DELETE FROM smart_scripts WHERE entryorguid IN (25090,25091,25092) AND source_type=0;
INSERT INTO smart_scripts VALUES
(25090,0,0,0,8,0,100,0,45115,0,0,0,33,25090,0,0,0,0,0,7,0,0,0,0,0,0,0,"Sin'Loren - On spellhit 45115 - Kill Credit"),
(25091,0,0,0,8,0,100,0,45115,0,0,0,33,25091,0,0,0,0,0,7,0,0,0,0,0,0,0,"Bloodoath - On spellhit 45115 - Kill Credit"),
(25092,0,0,0,8,0,100,0,45115,0,0,0,33,25092,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dawnchaser - On spellhit 45115 - Kill Credit");
/*
Backup for next DELETE query
INSERT INTO conditions VALUES
(15,9143,0,0,0,9,0,11542,0,0,0,0,0,,"Show gossip option if player has quest 11542 but not complete"),
(15,9143,0,0,1,9,0,11543,0,0,0,0,0,,"Show gossip option if player has quest 11543 but not complete");
*/
DELETE FROM conditions WHERE SourceTypeOrReferenceId=15 AND SourceGroup=9143;

7
src/game/Chat/Chat.cpp
View File

@@ -136,7 +136,7 @@ bool ChatHandler::hasStringAbbr(const char* name, const char* part)
if (!*part)
return false;
for (;;)
while (true)
{
if (!*part)
return true;
@@ -246,7 +246,6 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c
for (uint32 i = 0; i < table.size(); ++i)
{
// for data fill use full explicit command names
if (table[i].Name == nullptr)
continue;
@@ -258,6 +257,9 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c
{
for (uint32 j = 0; j < table.size(); ++j)
{
if (table[j].Name == nullptr)
continue;
if (!hasStringAbbr(table[j].Name, cmd.c_str()))
continue;
@@ -268,7 +270,6 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c
}
}
}
if (match)
continue;