mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-06 04:42:28 +00:00
Merge remote-tracking branch 'upstream/master' into Warning_Cleanup
This commit is contained in:
commit
641f0ae291
@ -165,10 +165,10 @@ bool QuestParserCollection::PlayerHasQuestSubLocal(QuestEventID evt) {
|
||||
bool QuestParserCollection::PlayerHasQuestSubGlobal(QuestEventID evt) {
|
||||
if(_global_player_quest_status == QuestUnloaded) {
|
||||
std::string filename;
|
||||
QuestInterface *qi = GetQIByPlayerQuest(filename);
|
||||
QuestInterface *qi = GetQIByGlobalPlayerQuest(filename);
|
||||
if(qi) {
|
||||
_global_player_quest_status = qi->GetIdentifier();
|
||||
qi->LoadPlayerScript(filename);
|
||||
qi->LoadGlobalPlayerScript(filename);
|
||||
return qi->GlobalPlayerHasQuestSub(evt);
|
||||
}
|
||||
} else if(_global_player_quest_status != QuestFailedToLoad) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user