Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-31 14:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4

Browse Source 
# Conflicts:
#	src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
Ovahlord
2018-03-06 13:03:29 +01:00
parent 69904afc56 7c041c7366
commit f6d3b214c2
44 changed files with 711 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/database/Updater/DBUpdater.cpp
View File

@@ -288,7 +288,7 @@ bool DBUpdater<T>::Populate(DatabaseWorkerPool<T>& pool)
case LOCATION_DOWNLOAD:
{
std::string const filename = base.filename().generic_string();
std::string const workdir = boost::filesystem::current_path().generic_string().c_str();
std::string const workdir = boost::filesystem::current_path().generic_string();
TC_LOG_ERROR("sql.updates", ">> File \"%s\" is missing, download it from \"https://t.me/trinitycorelegacy\"" \
" Mirror: \"https://github.com/TrinityCoreLegacy/TrinityCore/releases\"" \
" uncompress it and place the file \"%s\" in the directory \"%s\".", filename.c_str(), filename.c_str(), workdir.c_str());