*Merge.

*One rev skipped:  Fixed exploit with several spells being casted on pet with no de-buff applied. Author: Elron.

--HG--
branch : trunk

1 files changed, 3 insertions, 1 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index ac81b9c2a6d..fd9fd6ce5c2 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -386,6 +386,8 @@ Map::EnsureGridCreated(const GridPair &p)
         Guard guard(*this);
         if(!getNGrid(p.x_coord, p.y_coord))
         {
+            sLog.outDebug("Loading grid[%u,%u] for map %u", p.x_coord, p.y_coord, i_id);
+
             setNGrid(new NGridType(p.x_coord*MAX_NUMBER_OF_GRIDS + p.y_coord, p.x_coord, p.y_coord, i_gridExpiry, sWorld.getConfig(CONFIG_GRID_UNLOAD)),
                 p.x_coord, p.y_coord);
 
@@ -1113,7 +1115,7 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll)
         if(!unloadAll && ActiveObjectsNearGrid(x, y) )
              return false;
 
-        DEBUG_LOG("Unloading grid[%u,%u] for map %u", x,y, i_id);
+        sLog.outDebug("Unloading grid[%u,%u] for map %u", x,y, i_id);
 
         ObjectGridUnloader unloader(*grid);