diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-04 22:14:56 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-04 22:14:56 +0100 |
| commit | 12c8cdc26c9e307c4ae475d6021349f8a5603f14 (patch) | |
| tree | 8033cd6f537cd7ac49e9a556f581d985ba04e8ff /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 1537de5b39d032b0d560db23fc4330f313dda67d (diff) | |
| parent | 8f6e9dc85ccda388bc5ced1921cd4e30cb5fe2e0 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
sql/base/auth_database.sql
sql/base/characters_database.sql
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/World/World.cpp
src/server/scripts/Spells/spell_generic.cpp
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index acbdfa6a4a2..640eef5d651 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -4945,7 +4945,7 @@ void ObjectMgr::LoadInstanceEncounters() continue; } - if (lastEncounterDungeon && !sLFGMgr->GetLFGDungeon(lastEncounterDungeon)) + if (lastEncounterDungeon && !sLFGMgr->GetLFGDungeonEntry(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; |