fix: adapt c860bf7 from MAO for the base engine #2598

Author: pandinocoder

Framework/Intersect.Framework.Core/GameObjects/Maps/MapBase.cs

@@ -149,7 +149,10 @@ public MapBase(MapBase mapBase) : base(mapBase?.Id ?? Guid.Empty)
 
                 foreach (var record in mapBase.LocalEvents)
                 {
-                    var evt = new EventBase(record.Key, record.Value?.JsonData);
+                    var evt = new EventBase(record.Key, record.Value?.JsonData)
+                    {
+                        MapId = Id,
+                    };
                     LocalEvents?.Add(record.Key, evt);
                 }
 

Intersect.Editor/Forms/DockingElements/frmMapEditor.cs

@@ -1907,22 +1907,29 @@ public void ProcessSelectionMovement(MapInstance tmpMap, bool ignoreMouse = fals
                     if (Globals.SelectionType != (int)SelectionTypes.CurrentLayer ||
                         Globals.CurrentLayer == LayerOptions.Events)
                     {
-                        if (Globals.SelectionSource.FindEventAt(x0 - dragxoffset, y0 - dragyoffset) != null)
+                        var eventAtPosition = Globals.SelectionSource.FindEventAt(x0 - dragxoffset, y0 - dragyoffset);
+                        if (eventAtPosition == null)
                         {
-                            if (tmpMap.FindEventAt(x0, y0) != null)
-                            {
-                                tmpMap.LocalEvents.Remove(tmpMap.FindEventAt(x0, y0).Id);
-                            }
-
-                            eventCopy = new EventBase(Guid.NewGuid(), Globals.SelectionSource.FindEventAt(x0 - dragxoffset, y0 - dragyoffset)
-                            )
-                            {
-                                SpawnX = x0,
-                                SpawnY = y0
-                            };
+                            continue;
+                        }
 
-                            tmpMap.LocalEvents.Add(eventCopy.Id, eventCopy);
+                        var eventOnTemporaryMap = tmpMap.FindEventAt(x0, y0);
+                        if (eventOnTemporaryMap != null)
+                        {
+                            tmpMap.LocalEvents.Remove(eventOnTemporaryMap.Id);
                         }
+
+                        eventCopy = new EventBase(
+                            Guid.NewGuid(),
+                            eventAtPosition
+                        )
+                        {
+                            MapId = tmpMap.Id,
+                            SpawnX = x0,
+                            SpawnY = y0,
+                        };
+
+                        tmpMap.LocalEvents.Add(eventCopy.Id, eventCopy);
                     }
                 }
             }

Intersect.Editor/Maps/MapInstance.cs

@@ -299,7 +299,7 @@ public void UpdateAdjacentAutotiles()
         }
     }
 
-    public EventBase FindEventAt(int x, int y)
+    public EventBase? FindEventAt(int x, int y)
     {
         if (LocalEvents.Count <= 0)
         {

Intersect.Server.Core/Database/DbInterface.cs

@@ -406,6 +406,9 @@ internal static bool InitDatabase(IServerContext serverContext)
         Console.WriteLine("Loading game data...");
 
         LoadAllGameObjects();
+
+        ValidateMapEvents();
+        
         LoadTime();
         OnClassesLoaded();
         OnMapsLoaded();
@@ -872,6 +875,107 @@ private static void LoadGameObjects(GameObjectType gameObjectType)
             throw;
         }
     }
+    
+    private static void ValidateMapEvents()
+    {
+        var missingEvents = 0;
+        var correctedEvents = 0;
+        
+        foreach (var (mapId, databaseObject) in MapController.Lookup)
+        {
+            if (databaseObject is not MapBase mapDescriptor)
+            {
+                ApplicationContext.CurrentContext.Logger.LogError(
+                    "Found an invalid database object in the MapDescriptor lookup ({InvalidObjectType}, {InvalidObjectId}, '{InvalidObjectName}'",
+                    databaseObject.GetType().GetName(qualified: true),
+                    databaseObject.Id,
+                    databaseObject.Name
+                );
+                continue;
+            }
+
+            var actualMapId = mapDescriptor.Id;
+            if (mapId != actualMapId)
+            {
+                ApplicationContext.CurrentContext.Logger.LogError(
+                    "Map with ID {ActualMapId} was recorded in the lookup under the ID {ExpectedMapId}, this needs to be investigated",
+                    actualMapId,
+                    mapId
+                );
+            }
+            
+            foreach (var eventId in mapDescriptor.EventIds)
+            {
+                if (!EventBase.TryGet(eventId, out var eventDescriptor))
+                {
+                    ApplicationContext.CurrentContext.Logger.LogWarning(
+                        "Map {MapId} references missing event {EventId}, unexpected behavior may occur",
+                        mapId,
+                        eventId
+                    );
+                    ++missingEvents;
+                    continue;
+                }
+
+                // Ignore common events
+                if (eventDescriptor is not { CommonEvent: false })
+                {
+                    continue;
+                }
+
+                // The map ID is correct, no validation necessary
+                var referencedMapId = eventDescriptor.MapId;
+                if (referencedMapId == mapId)
+                {
+                    continue;
+                }
+
+                // If the event is 1) not common and 2) is not using this map's ID, fix it. It was copied wrong in the editor
+                string referencedMapName = $"deleted map {referencedMapId}";
+                if (MapController.TryGet(referencedMapId, out var referencedMapDescriptor))
+                {
+                    referencedMapName = referencedMapDescriptor.Name;
+                }
+
+                if (string.IsNullOrWhiteSpace(referencedMapName))
+                {
+                    referencedMapName = "(unnamed map)";
+                }
+
+                eventDescriptor.MapId = mapId;
+                ++correctedEvents;
+
+                var eventName = eventDescriptor.Name?.Trim();
+                if (string.IsNullOrWhiteSpace(eventName))
+                {
+                    eventName = "(unnamed event)";
+                }
+
+                var mapName = mapDescriptor.Name;
+                if (string.IsNullOrWhiteSpace(mapName))
+                {
+                    mapName = "(unnamed map)";
+                }
+
+
+                ApplicationContext.CurrentContext.Logger.LogWarning(
+                    "Event '{EventName}' ({EventId}) on the map '{MapName}'({MapId}) was pointing to '{ReferencedMapName}' ({ReferencedMapId}) and while this has been corrected, the correction will not be saved until the event is resaved",
+                    eventName,
+                    eventId,
+                    mapName,
+                    mapId,
+                    referencedMapName,
+                    referencedMapId
+                );
+            }
+        }
+
+        ApplicationContext.CurrentContext.Logger.LogWarning(
+            "Finished validating map events on all maps, there were {MissingEvents} missing events and {CorrectedEvents} corrected events",
+            missingEvents,
+            correctedEvents
+        );
+    }
 
     public static IDatabaseObject AddGameObject(GameObjectType gameObjectType)
     {

Intersect.Server.Core/Maps/MapController.cs

@@ -626,7 +626,7 @@ public void ClearAllInstances()
         mInstances.Clear();
     }
     #endregion
-
+    
     /// <summary>
     /// Gets rid of any orphaned tile layers
     /// </summary>