From a409efa817b8c2fc7082bdf55a2cc650d0e4d51d Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Mon, 27 Jul 2015 10:18:48 +0200
Subject: [PATCH] Core/Misc: Partialy revert previous commit

---
 src/server/collision/Management/MMapManager.cpp | 4 ++--
 src/server/game/Achievements/AchievementMgr.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/collision/Management/MMapManager.cpp b/src/server/collision/Management/MMapManager.cpp
index 9fe084dd7db..8ef6c4669cd 100644
--- a/src/server/collision/Management/MMapManager.cpp
+++ b/src/server/collision/Management/MMapManager.cpp
@@ -260,9 +260,9 @@ namespace MMAP
 
         for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i)
         {
-            if (MapEntry const* map = sMapStore.LookupEntry(i))
+            if (const MapEntry* const map = sMapStore.LookupEntry(i))
             {
-                if (map->ParentMapID == int32(mapId))
+                if (map->rootPhaseMap == int32(mapId))
                 {
                     PhasedTile* data = LoadTile(map->MapID, x, y);
                     // only a few tiles have terrain swaps, do not write error for them
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 5a431c0fdad..b236ee5c9ad 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -397,7 +397,7 @@ template<class T>
 AchievementMgr<T>::~AchievementMgr() { }
 
 template<class T>
-void AchievementMgr<T>::SendPacket(WorldPacket const* /*data*/) const { }
+void AchievementMgr<T>::SendPacket(WorldPacket* /*data*/) const { }
 
 template<>
 void AchievementMgr<Guild>::SendPacket(WorldPacket* data) const