Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw

Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/PathGenerator.cpp

1 files changed, 9 insertions, 0 deletions

diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index 43b4b57c179..3dd311c2da5 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -107,6 +107,12 @@ static const char* const langs[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koK
 
 void CreateDir( const std::string& Path )
 {
+    if(chdir(Path.c_str()) == 0)
+    {
+            chdir("../");
+            return;
+    }
+
     int ret;
     #ifdef _WIN32
     ret = _mkdir( Path.c_str());
@@ -1046,6 +1052,9 @@ void ExtractDBCFiles(int locale, bool basicLocale)
     {
         string filename = path;
         filename += (iter->c_str() + strlen("DBFilesClient\\"));
+        
+        if(FileExists(filename.c_str()))
+            continue;
 
         if (ExtractFile(iter->c_str(), filename))
             ++count;