Ground Objects Fix

Author: FallenDev

Zolian.Server.Base/Network/Components/ObjectComponent.cs

@@ -57,6 +57,7 @@ private static async Task UpdateObjects()
                 while (user.LoggedIn && user.ObjectsUpdating)
                 {
                     if (user.Client == null) return;
+                    HandleObjectsOutOfView(user);
                     UpdateClientObjects(user);
                     await Task.Delay(50);
                     user.ObjectsUpdating = false;
@@ -75,33 +76,26 @@ private static void UpdateClientObjects(Aisling user)
         var payload = new List<Sprite>();
 
         // Retrieve and categorize
-        var objects = ObjectManager.GetObjects(user.Map, selector => selector is not null, ObjectManager.Get.All).ToList();
+        var objects = ObjectManager.GetObjects(user.Map, s => s.WithinRangeOf(user, 13), ObjectManager.Get.All).ToList();
 
         foreach (var obj in objects)
         {
             switch (obj)
             {
                 case null:
                     continue;
-                case Item item when obj.WithinRangeOf(user, 13) && !user.SpritesInView.ContainsKey(item.ItemVisibilityId):
+                case Item item when !user.SpritesInView.ContainsKey(item.ItemVisibilityId):
                     {
                         payload.Add(obj);
                         break;
                     }
-                case Item item when !obj.WithinRangeOf(user, 13) && user.SpritesInView.ContainsKey(item.ItemVisibilityId):
-                    {
-                        RemoveObject(user, obj);
-                        break;
-                    }
                 case Aisling:
                 case Monster:
                 case Mundane:
                 case Money:
                     {
-                        if (obj.WithinRangeOf(user, 13) && !user.SpritesInView.ContainsKey(obj.Serial))
+                        if (!user.SpritesInView.ContainsKey(obj.Serial))
                             payload.Add(obj);
-                        else if (!obj.WithinRangeOf(user, 13) && user.SpritesInView.ContainsKey(obj.Serial))
-                            RemoveObject(user, obj);
                         break;
                     }
             }
@@ -115,6 +109,34 @@ private static void UpdateClientObjects(Aisling user)
         user.Client.SendVisibleEntities(toUpdate);
     }
 
+    private static void HandleObjectsOutOfView(Aisling user)
+    {
+        foreach (var (serial, sprite) in user.SpritesInView)
+        {
+            switch (sprite)
+            {
+                case null:
+                    user.SpritesInView.TryRemove(serial, out _);
+                    continue;
+                case Item item:
+                {
+                    if (user.SpritesInView.ContainsKey(item.ItemVisibilityId) && (item.ItemPane != Item.ItemPanes.Ground || !sprite.WithinRangeOf(user, 13)))
+                        RemoveObject(user, sprite);
+                    break;
+                }
+                case Aisling:
+                case Monster:
+                case Mundane:
+                case Money:
+                {
+                    if (!sprite.WithinRangeOf(user, 13) && user.SpritesInView.ContainsKey(sprite.Serial))
+                        RemoveObject(user, sprite);
+                    break;
+                }
+            }
+        }
+    }
+
     private static void RemoveObject(Aisling self, Sprite objectToRemove)
     {
         // Validate