diff options
| author | Spp <spp@jorge.gr> | 2012-10-19 14:24:11 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-10-19 14:24:11 +0200 |
| commit | 2e55abcde43c7e0aef3dda5cf896165491551031 (patch) | |
| tree | 9ff5edca826a758062681af16325a649d42d9e93 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 56df638092c551a025cd3dc200ed5d330f92fa63 (diff) | |
| parent | 4e8fa520c8aca831580fba9bf762486b9a9d7ed0 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSession.h
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index d62a4c9b9fb..87f4a0e6dbf 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -47,6 +47,7 @@ #include "PoolMgr.h" #include "DB2Structure.h" #include "DB2Stores.h" +#include "LFGMgr.h" ScriptMapMap sQuestEndScripts; ScriptMapMap sQuestStartScripts; @@ -4978,7 +4979,7 @@ void ObjectMgr::LoadInstanceEncounters() continue; } - if (lastEncounterDungeon && !sLFGDungeonStore.LookupEntry(lastEncounterDungeon)) + if (lastEncounterDungeon && !sLFGMgr->GetLFGDungeon(lastEncounterDungeon)) { sLog->outError(LOG_FILTER_SQL, "Table `instance_encounters` has an encounter %u (%s) marked as final for invalid dungeon id %u, skipped!", entry, dungeonEncounter->encounterName, lastEncounterDungeon); continue; |