From df98bca4bc1f16f8788ce1d4588708479c37d8a1 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Mon, 19 Jan 2026 11:39:49 -0800
Subject: [PATCH] Fix Erronius entity deletion on grid deletion from SetTiles()
 (#6367)

Don't delete the grid *before* we raise the event???

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs b/Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs
index a2a76458e..6c21c9453 100644
--- a/Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs
+++ b/Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs
@@ -876,12 +876,12 @@ public abstract partial class SharedMapSystem
             chunk.SuppressCollisionRegeneration = false;
         }
 
-        RegenerateCollision(uid, grid, modified);
-
         // Notify of all tile changes in one event
         var ev = new TileChangedEvent((uid, grid), tileChanges.ToArray());
         RaiseLocalEvent(uid, ref ev, true);
 
+        RegenerateCollision(uid, grid, modified);
+
         // Back to normal
         MapManager.SuppressOnTileChanged = false;
     }