fix: Fixes critical serial dupe bug and deserialization/serialization…

… issues. (#1245)
modernuo · Nov 13, 2022 · 6d00b2c · 6d00b2c
1 parent e66efef
commit 6d00b2c
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 16 deletions.
diff --git a/Projects/Server/Items/Containers.cs b/Projects/Server/Items/Containers.cs
@@ -68,11 +68,6 @@ public override void Deserialize(IGenericReader reader)
                     Owner = reader.ReadEntity<Mobile>();
                     Opened = reader.ReadBool();
 
-                    if (Owner == null)
-                    {
-                        Delete();
-                    }
-
                     break;
                 }
         }
@@ -81,6 +76,11 @@ public override void Deserialize(IGenericReader reader)
         {
             ItemID = 0xE7C;
         }
+
+        if (Owner == null)
+        {
+            Timer.DelayCall(Delete);
+        }
     }
 
     public void Close()

diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs
@@ -2680,7 +2680,7 @@ public virtual void Deserialize(IGenericReader reader)
 
                         if (m_Parent == null && (parent.IsMobile || parent.IsItem))
                         {
-                            Delete();
+                            Timer.DelayCall(Delete);
                         }
                     }
 
@@ -2841,7 +2841,7 @@ public virtual void Deserialize(IGenericReader reader)
 
                         if (m_Parent == null && (parent.IsMobile || parent.IsItem))
                         {
-                            Delete();
+                            Timer.DelayCall(Delete);
                         }
                     }
 
@@ -2959,7 +2959,7 @@ public virtual void Deserialize(IGenericReader reader)
 
                     if (m_Parent == null && (parent.IsMobile || parent.IsItem))
                     {
-                        Delete();
+                        Timer.DelayCall(Delete);
                     }
 
                     var count = reader.ReadInt();

diff --git a/Projects/Server/World/World.cs b/Projects/Server/World/World.cs
@@ -63,6 +63,15 @@ public static Serial NewMobile
     {
         get
         {
+#if THREADGUARD
+            if (Thread.CurrentThread != Core.Thread)
+            {
+                logger.Error(
+                    "Attempted to get a new mobile serial from the wrong thread!\n{StackTrace}",
+                    new StackTrace()
+                );
+            }
+#endif
             var last = _lastMobile;
             var maxMobile = (Serial)MaxMobileSerial;
 
@@ -75,7 +84,7 @@ public static Serial NewMobile
                     last = (Serial)1;
                 }
 
-                if (FindMobile(last) == null)
+                if (FindMobile(last, true) == null)
                 {
                     return _lastMobile = last;
                 }
@@ -90,6 +99,15 @@ public static Serial NewItem
     {
         get
         {
+#if THREADGUARD
+            if (Thread.CurrentThread != Core.Thread)
+            {
+                logger.Error(
+                    "Attempted to get a new item serial from the wrong thread!\n{StackTrace}",
+                    new StackTrace()
+                );
+            }
+#endif
             var last = _lastItem;
 
             for (int i = 0; i < _maxItems; i++)
@@ -101,7 +119,7 @@ public static Serial NewItem
                     last = (Serial)ItemOffset;
                 }
 
-                if (FindItem(last) == null)
+                if (FindItem(last, true) == null)
                 {
                     return _lastItem = last;
                 }
@@ -317,15 +335,19 @@ private static void ProcessSafetyQueues()
             AddEntity(entity);
         }
 
+        _pendingAdd.Clear();
+
         foreach (var entity in _pendingDelete.Values)
         {
             if (_pendingAdd.ContainsKey(entity.Serial))
             {
-                logger.Warning("Entity {Entity} was both pending both deletion and addition after save", entity);
+                logger.Warning("Entity {Entity} was both pending deletion and addition after save", entity);
             }
 
             RemoveEntity(entity);
         }
+
+        _pendingDelete.Clear();
     }
 
     private static void AppendSafetyLog(string action, ISerializable entity)
@@ -597,17 +619,30 @@ public static T FindEntity<T>(Serial serial, bool returnDeleted = false) where T
             case WorldState.Saving:
             case WorldState.WritingSave:
                 {
-                    if (_pendingDelete.TryGetValue(serial, out var entity))
+                    if (returnDeleted && _pendingDelete.TryGetValue(serial, out var entity))
                     {
-                        return !returnDeleted ? null : entity as T;
+                        return entity as T;
                     }
 
-                    if (_pendingAdd.TryGetValue(serial, out entity))
+                    if (!_pendingAdd.TryGetValue(serial, out entity))
                     {
-                        return entity as T;
+                        if (serial.IsItem)
+                        {
+                            if (Items.TryGetValue(serial, out var item))
+                            {
+                                entity = item;
+                            }
+                        }
+                        else // if (serial.IsMobile)
+                        {
+                            if (Mobiles.TryGetValue(serial, out var mob))
+                            {
+                                entity = mob;
+                            }
+                        }
                     }
 
-                    goto case WorldState.Running;
+                    return entity?.Deleted == false || returnDeleted ? entity as T : null;
                 }
             case WorldState.Running:
                 {