Core/Misc: Partialy revert previous commit

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

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