pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-18 03:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server into lsid

Browse Source
This commit is contained in:
Akkadius 2019-09-16 22:11:59 -05:00
commit 2a18d7cd80
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/rulesys.cpp
View File

@ -550,7 +550,7 @@ bool RuleManager::UpdateOrphanedRules(Database *db, bool quiet_update)
bool RuleManager::RestoreRuleNotes(Database *db) bool RuleManager::RestoreRuleNotes(Database *db)
{ {
std::string query("SELECT `ruleset_id`, `rule_name`, IFNULL(`notes`, '\\0')`notes` FROM `rule_values`"); std::string query("SELECT `ruleset_id`, `rule_name`, `notes` FROM `rule_values`");
auto results = db->QueryDatabase(query); auto results = db->QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
@ -560,22 +560,22 @@ bool RuleManager::RestoreRuleNotes(Database *db)
int update_count = 0; int update_count = 0;
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
const auto &rule = [&row]() { auto rule = [](const char *rule_name) {
for (const auto &rule_iter : s_RuleInfo) { for (auto rule_iter : s_RuleInfo) {
if (strcasecmp(rule_iter.name, row[1]) == 0) { if (strcasecmp(rule_iter.name, rule_name) == 0) {
return rule_iter; return rule_iter;
} }
} }
return s_RuleInfo[_IntRuleCount+_RealRuleCount+_BoolRuleCount]; return s_RuleInfo[_IntRuleCount+_RealRuleCount+_BoolRuleCount];
}(); }(row[1]);
if (strcasecmp(rule.name, row[1]) != 0) { if (strcasecmp(rule.name, row[1]) != 0) {
continue; continue;
} }
if (rule.notes.compare(row[2]) == 0) { if (row[2] != nullptr && rule.notes.compare(row[2]) == 0) {
continue; continue;
} }
@ -598,6 +598,8 @@ bool RuleManager::RestoreRuleNotes(Database *db)
if (update_count > 0) { if (update_count > 0) {
LogInfo("%u Rule Note%s Restored", update_count, (update_count == 1 ? "" : "s")); LogInfo("%u Rule Note%s Restored", update_count, (update_count == 1 ? "" : "s"));
} }
return true;
} }
int RuleManager::GetRulesetID(Database *database, const char *ruleset_name) { int RuleManager::GetRulesetID(Database *database, const char *ruleset_name) {

1
world/zonelist.cpp
View File

@ -432,6 +432,7 @@ void ZSList::SendChannelMessageRaw(const char* from, const char* to, uint8 chan_
} }
scm->language = language; scm->language = language;
scm->lang_skill = 100;
scm->chan_num = chan_num; scm->chan_num = chan_num;
strcpy(&scm->message[0], message); strcpy(&scm->message[0], message);