warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Changes Map.Sector.Items to link list. (#1547)

Browse source 
### Summary

Eliminates `IPooledEnumerable<T>` and `eable.Free()` from `Map` for items. This drastically simplifies code that iterates in range, for example:

```cs
foreach (var item in m.GetItemsInRange(5))
{
}
```
The code above no longer requires an eable and calling `Free()`.
This commit is contained in:
Kamron Batman 2023-10-16 20:51:02 -07:00 • committed by GitHub
parent 1330c4a830
commit 24858f3989
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 577 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Projects/UOContent/Commands/Object Creation/Decorate.cs
View file

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.Toolkit.HighPerformance;
using Server.Collections;
using Server.Engines.Quests.Haven;
using Server.Engines.Quests.Necro;
using Server.Engines.Spawners;
@ -78,8 +79,6 @@ namespace Server.Commands
private static readonly Type typeofCannon = typeof(Cannon);
private static readonly Type typeofSerpentPillar = typeof(SerpentPillar);
private static readonly Queue<Item> m_DeleteQueue = new();
private static readonly string[] m_EmptyParams = Array.Empty<string>();
private List<DecorationEntry> m_Entries;
private int m_ItemID;
@ -1037,16 +1036,17 @@ namespace Server.Commands
private static bool FindItem(int x, int y, int z, Map map, Item srcItem)
{
var itemID = srcItem.ItemID;
var lt = srcItem.Light;
var srcName = srcItem.ItemData.Name;
var type = srcItem.GetType();
var res = false;
IPooledEnumerable<Item> eable;
using var queue = PooledRefQueue<Item>.Create();
if (srcItem is BaseDoor)
foreach (var item in map.GetItemsInRange(new Point3D(x, y, z), 1))
{
eable = map.GetItemsInRange(new Point3D(x, y, z), 1);
foreach (var item in eable)
if (srcItem is BaseDoor)
{
if (!(item is BaseDoor))
{
@ -1079,18 +1079,10 @@ namespace Server.Commands
}
else if ((item.Z - z).Abs() < 8)
{
m_DeleteQueue.Enqueue(item);
queue.Enqueue(item);
}
}
}
else if (TileData.ItemTable[itemID & TileData.MaxItemValue].LightSource)
{
eable = map.GetItemsInRange(new Point3D(x, y, z), 0);
var lt = srcItem.Light;
var srcName = srcItem.ItemData.Name;
foreach (var item in eable)
else if (TileData.ItemTable[itemID & TileData.MaxItemValue].LightSource)
{
if (item.Z == z)
{
@ -1098,7 +1090,7 @@ namespace Server.Commands
{
if (item.Light != lt)
{
m_DeleteQueue.Enqueue(item);
queue.Enqueue(item);
}
else
{
@ -1107,24 +1099,17 @@ namespace Server.Commands
}
else if (item.ItemData.LightSource && item.ItemData.Name == srcName)
{
m_DeleteQueue.Enqueue(item);
queue.Enqueue(item);
}
}
}
}
else if (srcItem is Teleporter or FillableContainer or BaseBook)
{
eable = map.GetItemsInRange(new Point3D(x, y, z), 0);
var type = srcItem.GetType();
foreach (var item in eable)
else if (srcItem is Teleporter or FillableContainer or BaseBook)
{
if (item.Z == z && item.ItemID == itemID)
{
if (item.GetType() != type)
{
m_DeleteQueue.Enqueue(item);
queue.Enqueue(item);
}
else
{
@ -1132,12 +1117,7 @@ namespace Server.Commands
}
}
}
}
else
{
eable = map.GetItemsInRange(new Point3D(x, y, z), 0);
foreach (var item in eable)
else
{
if (item.Z == z && item.ItemID == itemID)
{
@ -1146,9 +1126,9 @@ namespace Server.Commands
}
}
while (m_DeleteQueue.Count > 0)
while (queue.Count > 0)
{
m_DeleteQueue.Dequeue().Delete();
queue.Dequeue().Delete();
}
return res;
@ -1196,7 +1176,6 @@ namespace Server.Commands
if (item is BaseDoor door)
{
var eable = maps[j].GetItemsInRange<BaseDoor>(loc, 1);
var itemType = door.GetType();
foreach (var link in eable)

57
Projects/UOContent/Commands/Object Creation/DecorateMag.cs
View file

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.Toolkit.HighPerformance;
using Server.Collections;
using Server.Engines.Quests.Haven;
using Server.Engines.Quests.Necro;
using Server.Engines.Spawners;
@ -74,8 +75,6 @@ namespace Server.Commands
private static readonly Type typeofCannon = typeof(Cannon);
private static readonly Type typeofSerpentPillar = typeof(SerpentPillar);
private static readonly Queue<Item> m_DeleteQueue = new();
private static readonly string[] m_EmptyParams = Array.Empty<string>();
private List<DecorationEntryMag> m_Entries;
private int m_ItemID;
@ -1033,16 +1032,16 @@ namespace Server.Commands
private static bool FindItem(int x, int y, int z, Map map, Item srcItem)
{
var itemID = srcItem.ItemID;
var lt = srcItem.Light;
var srcName = srcItem.ItemData.Name;
var type = srcItem.GetType();
var res = false;
IPooledEnumerable<Item> eable;
if (srcItem is BaseDoor)
using var queue = PooledRefQueue<Item>.Create();
foreach (var item in map.GetItemsInRange(new Point3D(x, y, z), 1))
{
eable = map.GetItemsInRange(new Point3D(x, y, z), 1);
foreach (var item in eable)
if (srcItem is BaseDoor)
{
if (!(item is BaseDoor))
{
@ -1075,18 +1074,10 @@ namespace Server.Commands
}
else if ((item.Z - z).Abs() < 8)
{
m_DeleteQueue.Enqueue(item);
queue.Enqueue(item);
}
}
}
else if (TileData.ItemTable[itemID & TileData.MaxItemValue].LightSource)
{
eable = map.GetItemsInRange(new Point3D(x, y, z), 0);
var lt = srcItem.Light;
var srcName = srcItem.ItemData.Name;
foreach (var item in eable)
else if (TileData.ItemTable[itemID & TileData.MaxItemValue].LightSource)
{
if (item.Z == z)
{
@ -1094,7 +1085,7 @@ namespace Server.Commands
{
if (item.Light != lt)
{
m_DeleteQueue.Enqueue(item);
queue.Enqueue(item);
}
else
{
@ -1103,24 +1094,17 @@ namespace Server.Commands
}
else if (item.ItemData.LightSource && item.ItemData.Name == srcName)
{
m_DeleteQueue.Enqueue(item);
queue.Enqueue(item);
}
}
}
}
else if (srcItem is Teleporter or FillableContainer or BaseBook)
{
eable = map.GetItemsInRange(new Point3D(x, y, z), 0);
var type = srcItem.GetType();
foreach (var item in eable)
else if (srcItem is Teleporter or FillableContainer or BaseBook)
{
if (item.Z == z && item.ItemID == itemID)
{
if (item.GetType() != type)
{
m_DeleteQueue.Enqueue(item);
queue.Enqueue(item);
}
else
{
@ -1128,12 +1112,7 @@ namespace Server.Commands
}
}
}
}
else
{
eable = map.GetItemsInRange(new Point3D(x, y, z), 0);
foreach (var item in eable)
else
{
if (item.Z == z && item.ItemID == itemID)
{
@ -1142,9 +1121,9 @@ namespace Server.Commands
}
}
while (m_DeleteQueue.Count > 0)
while (queue.Count > 0)
{
m_DeleteQueue.Dequeue()?.Delete();
queue.Dequeue()?.Delete();
}
return res;
@ -1181,11 +1160,9 @@ namespace Server.Commands
if (item is BaseDoor door)
{
var eable = maps[j].GetItemsInRange<BaseDoor>(loc, 1);
var itemType = door.GetType();
foreach (var link in eable)
foreach (var link in maps[j].GetItemsInRange<BaseDoor>(loc, 1))
{
if (link != item && link.Z == door.Z && link.GetType() == itemType)
{

7
Projects/UOContent/Commands/Object Creation/GenTeleporter.cs
View file

@ -121,17 +121,16 @@ namespace Server.Commands
public static int DeleteTeleporters(WorldLocation worldLocation)
{
var eable = worldLocation.Map.GetItemsInRange<Teleporter>(worldLocation, 0);
var count = 0;
foreach (var item in eable)
foreach (var item in worldLocation.Map.GetItemsInRange<Teleporter>(worldLocation, 0))
{
if (!(item is KeywordTeleporter or SkillTeleporter) && IsWithinZ(item.Z - worldLocation.Z))
if (item is not (KeywordTeleporter or SkillTeleporter) && IsWithinZ(item.Z - worldLocation.Z))
{
count++;
item.Delete();
}
}
return count;
}

4
Projects/UOContent/Commands/SignParser.cs
View file

@ -91,9 +91,7 @@ namespace Server.Commands
public static void Add_Static(int itemID, Point3D location, Map map, string name)
{
var eable = map.GetItemsInRange(location, 0);
foreach (var item in eable)
foreach (var item in map.GetItemsInRange(location, 0))
{
if (item is Sign && item.Z == location.Z && item.ItemID == itemID)
{

11
Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs
View file

@ -467,10 +467,8 @@ namespace Server.Engines.ConPVP
if (landTile.ID == 0x244 && statics.Length == 0) // 0x244 = invalid land tile
{
var eable = Map.GetItemsInRange(point, 0);
var empty = true;
foreach (var item in eable)
foreach (var item in Map.GetItemsInRange(point, 0))
{
if (item != this)
{
@ -513,8 +511,7 @@ namespace Server.Engines.ConPVP
var rect = new Rectangle2D(pTop.X, pTop.Y, pBottom.X - pTop.X + 1, pBottom.Y - pTop.Y + 1);
var area = Map.GetItemsInBounds(rect);
foreach (var i in area)
foreach (var i in Map.GetItemsInBounds(rect))
{
if (i == this || i.ItemID >= 0x4000)
{
@ -567,6 +564,7 @@ namespace Server.Engines.ConPVP
{
continue;
}
if (i is BRGoal goal)
{
var oldLoc = new Point3D(GetWorldLocation());
@ -662,8 +660,7 @@ namespace Server.Engines.ConPVP
}
}
var eable = GetItemsInRange(0);
foreach (var item in eable)
foreach (var item in GetItemsInRange(0))
{
if (item.Visible && item != this)
{

3
Projects/UOContent/Engines/Craft/Core/CraftItem.cs
View file

@ -387,8 +387,7 @@ namespace Server.Engines.Craft
return false;
}
var eable = map.GetItemsInRange(from.Location, 2);
foreach (var item in eable)
foreach (var item in map.GetItemsInRange(from.Location, 2))
{
if (item.Z + 16 > item.Z && item.Z + 16 > item.Z && Find(item.ItemID, itemIDs))
{

4
Projects/UOContent/Engines/Craft/DefBlacksmithy.cs
View file

@ -39,9 +39,7 @@ public class DefBlacksmithy : CraftSystem
return;
}
var eable = map.GetItemsInRange(from.Location, range);
foreach (var item in eable)
foreach (var item in map.GetItemsInRange(from.Location, range))
{
var type = item.GetType();

4
Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
View file

@ -197,9 +197,7 @@ public partial class LeverPuzzleController : Item
[Usage("GenLeverPuzzle"), Description("Generates lamp room and lever puzzle in doom.")]
public static void GenLampPuzzle_OnCommand(CommandEventArgs e)
{
var eable = Map.Malas.GetItemsInRange(lp_Center, 0);
foreach (var item in eable)
foreach (var item in Map.Malas.GetItemsInRange(lp_Center, 0))
{
if (item is LeverPuzzleController)
{

3
Projects/UOContent/Engines/Ethics/Core/Ethic.cs
View file

@ -155,10 +155,9 @@ namespace Server.Ethics
continue;
}
var eable = e.Mobile.GetItemsInRange(2);
var found = false;
foreach (var item in eable)
foreach (var item in e.Mobile.GetItemsInRange(2))
{
if (item is AnkhNorth or AnkhWest)
{

4
Projects/UOContent/Engines/Factions/Core/Generator.cs
View file

@ -78,14 +78,14 @@ namespace Server.Factions
private static bool CheckExistence(Point3D loc, Map facet, Type type)
{
var eable = facet.GetItemsInRange(loc, 0);
foreach (var item in eable)
foreach (var item in facet.GetItemsInRange(loc, 0))
{
if (type.IsInstanceOfType(item))
{
return true;
}
}
return false;
}
}

3
Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs
View file

@ -307,8 +307,7 @@ namespace Server.Engines.Harvest
return false;
}
var eable = m.GetItemsInRange(0);
foreach (var i in eable)
foreach (var i in m.GetItemsInRange(0))
{
if (i.StackWith(m, i, false))
{

18
Projects/UOContent/Engines/Khaldun/KhaldunGen.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Linq;
using Server.Items;
namespace Server.Commands
@ -15,10 +14,8 @@ namespace Server.Commands
public static bool FindMorphItem(int x, int y, int z, int inactiveItemID, int activeItemID)
{
var eable = Map.Felucca.GetItemsInRange(new Point3D(x, y, z), 0);
var found = false;
foreach (var item in eable)
foreach (var item in Map.Felucca.GetItemsInRange(new Point3D(x, y, z), 0))
{
if (item is MorphItem morphItem && morphItem.Z == z && morphItem.InactiveItemId == inactiveItemID && morphItem.ActiveItemId == activeItemID)
{
@ -26,15 +23,14 @@ namespace Server.Commands
break;
}
}
return found;
}
public static bool FindEffectController(int x, int y, int z)
{
var eable = Map.Felucca.GetItemsInRange(new Point3D(x, y, z), 0);
var found = false;
foreach (var item in eable)
foreach (var item in Map.Felucca.GetItemsInRange(new Point3D(x, y, z), 0))
{
if (item is EffectController && item.Z == z)
{
@ -42,22 +38,20 @@ namespace Server.Commands
break;
}
}
return found;
}
public static T TryCreateItem<T>(int x, int y, int z, T srcItem) where T : Item
{
var eable = Map.Felucca.GetItemsInBounds<T>(new Rectangle2D(x, y, 1, 1));
var t = eable.FirstOrDefault(item => item.GetType() == srcItem.GetType());
if (t != null)
foreach (var item in Map.Felucca.GetItemsInBounds<T>(new Rectangle2D(x, y, 1, 1)))
{
srcItem.Delete();
return t;
return item;
}
srcItem.MoveToWorld(new Point3D(x, y, z), Map.Felucca);
m_Count++;
return srcItem;
}

36
Projects/UOContent/Engines/ML Quests/MLQuest.cs
View file

@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Collections;
using Server.Engines.MLQuests.Gumps;
using Server.Engines.MLQuests.Objectives;
using Server.Engines.MLQuests.Rewards;
@ -266,25 +266,39 @@ namespace Server.Engines.MLQuests
{
var name = $"MLQS-{GetType().Name}";
var toDelete = map.GetItemsInRange(loc, 0).Where(item => item is BaseSpawner && item.Name == name);
foreach (var item in toDelete)
using var queue = PooledRefQueue<Item>.Create();
foreach (var item in map.GetItemsInRange(loc, 0))
{
item.Delete();
// This predates GUIDs. Let's build these spawners and export them so we can delete this code!
if (item is BaseSpawner spawner && spawner.Name == name)
{
queue.Enqueue(item);
}
}
while (queue.Count > 0)
{
queue.Dequeue().Delete();
}
s.Name = name;
s.MoveToWorld(loc, map);
}
public void PutDeco(Item deco, Point3D loc, Map map)
public static void PutDeco(Item deco, Point3D loc, Map map)
{
// Auto cleanup on regeneration
var toDelete = map.GetItemsInRange(loc, 0).Where(item => item.ItemID == deco.ItemID && item.Z == loc.Z);
foreach (var item in toDelete)
using var queue = PooledRefQueue<Item>.Create();
foreach (var item in map.GetItemsInRange(loc, 0))
{
item.Delete();
if (item.ItemID == deco.ItemID && item.Z == loc.Z)
{
queue.Enqueue(item);
}
}
while (queue.Count > 0)
{
queue.Dequeue().Delete();
}
deco.MoveToWorld(loc, map);

12
Projects/UOContent/Engines/Pathing/Movement.cs
View file

@ -98,10 +98,8 @@ namespace Server.Movement
foreach (var sector in _sectors)
{
for (var j = 0; j < sector.Items.Count; ++j)
foreach (var item in sector.Items)
{
var item = sector.Items[j];
if (ignoreMovableImpassables && item.Movable && item.ItemData.ImpassableSurface)
{
continue;
@ -167,10 +165,8 @@ namespace Server.Movement
if (!sectorStartIsForward)
{
for (var i = 0; i < sectorForward.Items.Count; ++i)
foreach (var item in sectorForward.Items)
{
var item = sectorForward.Items[i];
if (ignoreMovableImpassables && item.Movable && item.ItemData.ImpassableSurface)
{
continue;
@ -193,10 +189,8 @@ namespace Server.Movement
}
}
for (var i = 0; i < sectorStart.Items.Count; ++i)
foreach (var item in sectorStart.Items)
{
var item = sectorStart.Items[i];
if (ignoreMovableImpassables && item.Movable && item.ItemData.ImpassableSurface)
{
continue;

3
Projects/UOContent/Engines/Spawners/Commands/GenerateSpawnersCommand.cs
View file

@ -147,8 +147,7 @@ namespace Server.Engines.Spawners
// Delete all spawners at this location.
// Probably shouldn't do this outside of migrations? Is there a better way to find/fix spawners?
var eable = map.GetItemsInRange<BaseSpawner>(location, 0);
foreach (var spawner in eable)
foreach (var spawner in map.GetItemsInRange<BaseSpawner>(location, 0))
{
if (spawner.GetType() == type)
{

3
Projects/UOContent/Holiday Stuff/Halloween/2009/Engines/PumpkinPatch.cs
View file

@ -50,9 +50,8 @@ namespace Server.Engines.Events
var rect = m_PumpkinFields[i];
var spawncount = rect.Height * rect.Width / 20;
var eable = map.GetItemsInBounds<HalloweenPumpkin>(rect);
var pumpkins = 0;
foreach (var p in eable)
foreach (var _ in map.GetItemsInBounds<HalloweenPumpkin>(rect))
{
if (pumpkins++ >= spawncount)
{

13
Projects/UOContent/Items/Addons/SHTeleporter.cs
View file

@ -1,4 +1,3 @@
using System.Linq;
using ModernUO.Serialization;
using Server.Mobiles;
@ -268,9 +267,15 @@ namespace Server.Items
public static SHTeleporter FindSHTeleporter(Map map, Point3D p)
{
var eable = map.GetItemsInRange<SHTeleporter>(p, 0);
var teleporter = eable.FirstOrDefault(item => item.Z == p.Z);
return teleporter;
foreach (var teleporter in map.GetItemsInRange<SHTeleporter>(p, 0))
{
if (teleporter.Z == p.Z)
{
return teleporter;
}
}
return null;
}
public SHTeleporter AddSHT(Map map, bool ext, int x, int y, int z)

5
Projects/UOContent/Items/Construction/Doors/BaseDoor.cs
View file

@ -332,13 +332,10 @@ public abstract partial class BaseDoor : Item, ILockable, ITelekinesisable
var z = p.Z;
var sector = map.GetSector(x, y);
var items = sector.Items;
var mobs = sector.Mobiles;
for (var i = 0; i < items.Count; ++i)
foreach (var item in sector.Items)
{
var item = items[i];
if (item is not BaseMulti && item.ItemID <= TileData.MaxItemValue && item.AtWorldPoint(x, y) &&
item is not BaseDoor)
{

5
Projects/UOContent/Items/Containers/MarkContainer.cs
View file

@ -130,15 +130,14 @@ public partial class MarkContainer : LockableContainer
private static bool FindMarkContainer(Point3D p, Map map)
{
var eable = map.GetItemsInRange<MarkContainer>(p, 0);
foreach (var item in eable)
foreach (var item in map.GetItemsInRange<MarkContainer>(p, 0))
{
if (item.Z == p.Z)
{
return true;
}
}
return false;
}

3
Projects/UOContent/Items/Misc/OilFlask.cs
View file

@ -49,9 +49,8 @@ public partial class OilFlask : Item
if (!from.PlaceInBackpack(emptyFlask))
{
var didStack = false;
var eable = from.GetItemsInRange(0);
foreach (var i in eable)
foreach (var i in from.GetItemsInRange(0))
{
if (i.StackWith(from, this, false))
{

5
Projects/UOContent/Mobiles/AI/BaseAI.cs
View file

@ -2157,10 +2157,7 @@ public abstract class BaseAI
Movement.Movement.Offset(d, ref x, ref y);
var destroyables = 0;
var eable = map.GetItemsInRange(new Point3D(x, y, m_Mobile.Location.Z), 1);
foreach (var item in eable)
foreach (var item in map.GetItemsInRange(new Point3D(x, y, m_Mobile.Location.Z), 1))
{
if (canOpenDoors && item is BaseDoor door && door.Z + door.ItemData.Height > m_Mobile.Z &&
m_Mobile.Z + 16 > door.Z)

3
Projects/UOContent/Mobiles/BaseCreature.cs
View file

@ -3638,9 +3638,8 @@ namespace Server.Mobiles
return false;
}
var eable = GetItemsInRange<Corpse>(2);
Corpse toRummage = null;
foreach (var c in eable)
foreach (var c in GetItemsInRange<Corpse>(2))
{
if (c.Items.Count > 0)
{

3
Projects/UOContent/Mobiles/Familiars/HordeMinion.cs
View file

@ -74,9 +74,8 @@ public partial class HordeMinionFamiliar : BaseFamiliar
return;
}
var eable = GetItemsInRange(2);
using var queue = PooledRefQueue<Item>.Create();
foreach (var item in eable)
foreach (var item in GetItemsInRange(2))
{
if (item.Movable && item.Stackable)
{

10
Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs
View file

@ -117,9 +117,13 @@ namespace Server.Mobiles
{
p = GetSpawnPosition(2);
var eable = Map.GetItemsInRange<StainedOoze>(p, 0);
using var enumerator = eable.GetEnumerator();
bool atLocation = enumerator.MoveNext();
var atLocation = false;
foreach (var item in Map.GetItemsInRange<StainedOoze>(p, 0))
{
atLocation = true;
break;
}
if (!atLocation)
{
break;

10
Projects/UOContent/Mobiles/Monsters/ML/Special/Ilhenir.cs
View file

@ -234,9 +234,13 @@ namespace Server.Mobiles
{
p = GetSpawnPosition(2);
var eable = Map.GetItemsInRange<StainedOoze>(p, 0);
using var enumerator = eable.GetEnumerator();
bool atLocation = enumerator.MoveNext();
var atLocation = false;
foreach (var item in Map.GetItemsInRange<StainedOoze>(p, 0))
{
atLocation = true;
break;
}
if (!atLocation)
{
break;

13
Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs
View file

@ -165,18 +165,13 @@ namespace Server.Mobiles
base.OnThink();
// Check to see if we need to devour any corpses
var eable = GetItemsInRange<Corpse>(3); // Get all corpses in range
foreach (var item in eable)
// Ensure that the corpse was killed by us
foreach (var item in GetItemsInRange<Corpse>(3)) // Get all corpses in range
{
// Ensure that the corpse was killed by us
if (item.Killer == this && item.Owner != null && !item.DevourCorpse() && !item.Devoured)
{
PublicOverheadMessage(
MessageType.Emote,
0x3B2,
1053032
); // * The plague beast attempts to absorb the remains, but cannot! *
// * The plague beast attempts to absorb the remains, but cannot! *
PublicOverheadMessage(MessageType.Emote, 0x3B2, 1053032);
}
}
}

44
Projects/UOContent/Multis/Boats/BaseBoat.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using Server.Engines.Spawners;
using Server.Items;
@ -1502,31 +1501,32 @@ namespace Server.Multis
}
}
var eable = map.GetItemsInBounds(
new Rectangle2D(
p.X + newComponents.Min.X,
p.Y + newComponents.Min.Y,
newComponents.Width,
newComponents.Height
)
var bounds = new Rectangle2D(
p.X + newComponents.Min.X,
p.Y + newComponents.Min.Y,
newComponents.Width,
newComponents.Height
);
var canFit = eable.All(
item =>
foreach (var item in map.GetItemsInBounds(bounds))
{
if (item is BaseMulti || item.ItemID > TileData.MaxItemValue || item.Z < p.Z || !item.Visible)
{
if (item is BaseMulti || item.ItemID > TileData.MaxItemValue || item.Z < p.Z || !item.Visible)
{
return true;
}
var x = item.X - p.X + newComponents.Min.X;
var y = item.Y - p.Y + newComponents.Min.Y;
return x >= 0 && x < newComponents.Width && y >= 0 && y < newComponents.Height &&
newComponents.Tiles[x][y].Length == 0 || Contains(item);
continue;
}
);
return canFit;
var x = item.X - p.X + newComponents.Min.X;
var y = item.Y - p.Y + newComponents.Min.Y;
// Out of bounds, return false - cannot fit
if ((x < 0 || x >= newComponents.Width || y < 0 || y >= newComponents.Height ||
newComponents.Tiles[x][y].Length != 0) && !Contains(item))
{
return false;
}
}
return true;
}
public Point3D Rotate(Point3D p, int count)

22
Projects/UOContent/Multis/Houses/BaseHouse.cs
View file

@ -1141,6 +1141,7 @@ namespace Server.Multis
MovingCrate.DropItem(item);
}
// TODO: Convert to a ref struct enumerator
public List<Item> GetItems()
{
if (Map == null || Map == Map.Internal)
@ -1152,8 +1153,14 @@ namespace Server.Multis
var end = new Point2D(X + Components.Max.X + 1, Y + Components.Max.Y + 1);
var rect = new Rectangle2D(start, end);
var eable = Map.GetItemsInBounds(rect);
var list = eable.Where(item => item.Movable && IsInside(item)).ToList();
var list = new List<Item>();
foreach (var item in Map.GetItemsInBounds(rect))
{
if (item.Movable && IsInside(item))
{
list.Add(item);
}
}
return list;
}
@ -3653,11 +3660,14 @@ namespace Server.Multis
}
var mcl = Components;
var eable =
map.GetItemsInBounds<Guildstone>(new Rectangle2D(X + mcl.Min.X, Y + mcl.Min.Y, mcl.Width, mcl.Height));
var bounds = new Rectangle2D(X + mcl.Min.X, Y + mcl.Min.Y, mcl.Width, mcl.Height);
var item = eable.FirstOrDefault(Contains);
return item;
foreach (var gs in map.GetItemsInBounds<Guildstone>(bounds))
{
return gs;
}
return null;
}
public void ResetDynamicDecay()

9
Projects/UOContent/Multis/Houses/HousePlacement.cs
View file

@ -142,10 +142,8 @@ namespace Server.Multis
items.Clear();
for (var i = 0; i < sector.Items.Count; ++i)
foreach (var item in sector.Items)
{
var item = sector.Items[i];
if (item.Visible && item.X == tileX && item.Y == tileY)
{
items.Add(item);
@ -366,12 +364,9 @@ namespace Server.Multis
}
var sector = map.GetSector(borderPoint.X, borderPoint.Y);
var sectorItems = sector.Items;
for (var j = 0; j < sectorItems.Count; ++j)
foreach (var item in sector.Items)
{
var item = sectorItems[j];
if (item.X != borderPoint.X || item.Y != borderPoint.Y || item.Movable)
{
continue;

8
Projects/UOContent/Skills/DetectHidden.cs
View file

@ -83,17 +83,15 @@ namespace Server.SkillHandlers
if (Faction.Find(src) != null)
{
var itemsInRange = src.Map.GetItemsInRange<BaseFactionTrap>(p, range);
foreach (var trap in itemsInRange)
foreach (var trap in src.Map.GetItemsInRange<BaseFactionTrap>(p, range))
{
if (src.CheckTargetSkill(SkillName.DetectHidden, trap, 80.0, 100.0))
{
src.SendLocalizedMessage(
1042712,
1042712, // You reveal a trap placed by a faction:
true,
$" {(trap.Faction == null ? "" : trap.Faction.Definition.FriendlyName)}"
); // You reveal a trap placed by a faction:
);
trap.Visible = true;
trap.BeginConceal();

3
Projects/UOContent/Skills/SpiritSpeak.cs
View file

@ -124,9 +124,8 @@ namespace Server.SkillHandlers
public override void OnCast()
{
var eable = Caster.GetItemsInRange<Corpse>(3);
Corpse toChannel = null;
foreach (var corpse in eable)
foreach (var corpse in Caster.GetItemsInRange<Corpse>(3))
{
if (!corpse.Channeled)
{

4
Projects/UOContent/Spells/Seventh/GateTravel.cs
View file

@ -141,9 +141,7 @@ namespace Server.Spells.Seventh
private static bool GateExistsAt(Map map, Point3D loc)
{
var eable = map.GetItemsInRange(loc, 0);
foreach (var item in eable)
foreach (var item in map.GetItemsInRange(loc, 0))
{
if (item is Moongate or PublicMoongate)
{

4
Projects/UOContent/Spells/Spellweaving/ArcaneCircle.cs
View file

@ -97,9 +97,7 @@ namespace Server.Spells.Spellweaving
}
}
var eable = map.GetItemsInRange(location, 0);
foreach (var item in eable)
foreach (var item in map.GetItemsInRange(location, 0))
{
if (item.Z + item.ItemData.CalcHeight == location.Z && IsValidTile(item.ItemID))
{

4
Projects/UOContent/Spells/Third/Teleport.cs
View file

@ -96,9 +96,7 @@ namespace Server.Spells.Third
m.PlaySound(0x1FE);
var eable = m.GetItemsInRange(0);
foreach (var item in eable)
foreach (var item in m.GetItemsInRange(0))
{
if (item is ParalyzeFieldSpell.InternalItem or
PoisonFieldSpell.InternalItem or FireFieldSpell.FireFieldItem)