Minor cleanup and logic update to delete map events when maps are rem…

…oved from the db (#1849)
AscensionGameDev · Aug 24, 2023 · a7dd12c · a7dd12c
1 parent a86bfe3
commit a7dd12c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Intersect.Server/Database/DbInterface.cs b/Intersect.Server/Database/DbInterface.cs
@@ -1049,6 +1049,15 @@ public static void DeleteGameObject(IDatabaseObject gameObject)
 
                             break;
                         case GameObjectType.Map:
+                            //Delete all map events first
+                            foreach (var evtId in ((MapController)gameObject).EventIds)
+                            {
+                                var evt = EventBase.Get(evtId);
+                                if (evt != null)
+                                {
+                                    DeleteGameObject(evt);
+                                }
+                            }
                             context.Maps.Remove((MapController)gameObject);
                             MapController.Lookup.Delete(gameObject);
 

diff --git a/Intersect.Server/Networking/PacketHandler.cs b/Intersect.Server/Networking/PacketHandler.cs
@@ -3349,11 +3349,12 @@ public void HandlePacket(Client client, Network.Packets.Editor.MapListUpdatePack
 
                         lock (ServerContext.Instance.LogicService.LogicLock)
                         {
+                            var map = MapController.Get(mapId);
                             ServerContext.Instance.LogicService.LogicPool.WaitForIdle();
                             mapId = packet.TargetId;
-                            var players = MapController.Get(mapId).GetPlayersOnAllInstances();
+                            var players = map.GetPlayersOnAllInstances();
                             MapList.List.DeleteMap(mapId);
-                            DbInterface.DeleteGameObject(MapController.Get(mapId));
+                            DbInterface.DeleteGameObject(map);
                             DbInterface.GenerateMapGrids();
                             PacketSender.SendMapListToAll();
                             foreach (var plyr in players)