fix: Change Decorate FindItem range from 0 to 1 (#1725)

modernuo · Apr 7, 2024 · 6c07673 · 6c07673
1 parent d6fe502
commit 6c07673
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/Projects/UOContent/Commands/Object Creation/Decorate.cs b/Projects/UOContent/Commands/Object Creation/Decorate.cs
@@ -1045,7 +1045,7 @@ private static bool FindItem(int x, int y, int z, Map map, Item srcItem)
 
             using var queue = PooledRefQueue<Item>.Create();
 
-            foreach (var item in map.GetItemsInRange(new Point3D(x, y, z), 1))
+            foreach (var item in map.GetItemsAt(x, y))
             {
                 if (srcItem is BaseDoor)
                 {
@@ -1118,12 +1118,9 @@ private static bool FindItem(int x, int y, int z, Map map, Item srcItem)
                         }
                     }
                 }
-                else
+                else if (item.Z == z && item.ItemID == itemID)
                 {
-                    if (item.Z == z && item.ItemID == itemID)
-                    {
-                        return true;
-                    }
+                    return true;
                 }
             }
 

diff --git a/Projects/UOContent/Commands/Object Creation/DecorateMag.cs b/Projects/UOContent/Commands/Object Creation/DecorateMag.cs
@@ -1040,7 +1040,7 @@ private static bool FindItem(int x, int y, int z, Map map, Item srcItem)
             var res = false;
 
             using var queue = PooledRefQueue<Item>.Create();
-            foreach (var item in map.GetItemsInRange(new Point3D(x, y, z), 1))
+            foreach (var item in map.GetItemsAt(x, y))
             {
                 if (srcItem is BaseDoor)
                 {
@@ -1113,12 +1113,9 @@ private static bool FindItem(int x, int y, int z, Map map, Item srcItem)
                         }
                     }
                 }
-                else
+                else if (item.Z == z && item.ItemID == itemID)
                 {
-                    if (item.Z == z && item.ItemID == itemID)
-                    {
-                        return true;
-                    }
+                    return true;
                 }
             }