From 52b60d51e70a5d78f3d03b9501189fdb16766c97 Mon Sep 17 00:00:00 2001
From: ariel- <ariel.silva305@gmail.com>
Date: Tue, 19 Jan 2016 23:34:36 -0300
Subject: [PATCH] Core/Maps: fixed map loading after merge if datadir was
 different from local

---
 src/server/game/Maps/Map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 4d84c4d163c..e8d0448f848 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -71,7 +71,7 @@ Map::~Map()
 
 bool Map::ExistMap(uint32 mapid, int gx, int gy)
 {
-    std::string fileName = Trinity::StringFormat("maps/%03u%02u%02u.map", mapid, gx, gy);
+    std::string fileName = Trinity::StringFormat("%smaps/%03u%02u%02u.map", sWorld->GetDataPath().c_str(), mapid, gx, gy);
 
     bool ret = false;
     FILE* file = fopen(fileName.c_str(), "rb");