From f554cde330de66f111f3fa3e6e28c66776bc500e Mon Sep 17 00:00:00 2001
From: Localhost <40755539+r0m1ntik@users.noreply.github.com>
Date: Sun, 22 Mar 2026 15:54:14 +0100
Subject: [PATCH] =?UTF-8?q?fix(Core/Map):=20Ensure=20grid=20is=20valid=20b?=
 =?UTF-8?q?efore=20unloading=20to=20prevent=20potential=20=E2=80=A6=20(#24?=
 =?UTF-8?q?621)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Roman BADANIN <r.badanin@defi-informatique.fr>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/server/game/Maps/Map.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 63aad5ebb..27d0b8fed 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -1037,9 +1037,10 @@ void Map::UnloadAll()
 
     for (GridRefMgr<MapGridType>::iterator i = GridRefMgr<MapGridType>::begin(); i != GridRefMgr<MapGridType>::end();)
     {
-        MapGridType& grid(*i->GetSource());
+        MapGridType* grid = i->GetSource();
         ++i;
-        UnloadGrid(grid); // deletes the grid and removes it from the GridRefMgr
+        if (grid)
+            UnloadGrid(*grid);
     }
 
     // pussywizard: crashfix, some npc can be left on transport (not a default passenger)