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

fix: Adds GetClients to map iterators (#1574)

Browse source 
### Summary

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

```cs
foreach (var m in m.GetClientsInRange(5))
{
}
```
The code above no longer requires an eable and calling `Free()`.
This commit is contained in:
Kamron Batman 2023-10-30 18:49:00 -07:00 • committed by GitHub
parent 469b89370d
commit cde59a82f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 347 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Projects/Server/Maps/PooledEnumeration.cs
View file

@ -19,7 +19,6 @@ using System.Collections.Generic;
using System.Linq;
using Server.Collections;
using Server.Items;
using Server.Network;
namespace Server;
@ -33,34 +32,16 @@ public static class PooledEnumeration
static PooledEnumeration()
{
ClientSelector = SelectClients;
EntitySelector = SelectEntities;
MultiSelector = SelectMultis;
MultiTileSelector = SelectMultiTiles;
}
public static Selector<NetState> ClientSelector { get; set; }
public static Selector<IEntity> EntitySelector { get; set; }
public static Selector<Mobile> MobileSelector { get; set; }
public static Selector<BaseMulti> MultiSelector { get; set; }
public static Selector<StaticTile[]> MultiTileSelector { get; set; }
public static IEnumerable<NetState> SelectClients(Map.Sector s, Rectangle2D bounds)
{
var clients = new List<NetState>(s.Clients.Count);
foreach (var client in s.Clients)
{
var m = client.Mobile;
if (m?.Deleted == false && bounds.Contains(m.Location))
{
clients.Add(client);
}
}
return clients;
}
public static IEnumerable<IEntity> SelectEntities(Map.Sector s, Rectangle2D bounds)
{
var entities = new List<IEntity>(s.Mobiles.Count + s.Items.Count);
@ -145,9 +126,6 @@ public static class PooledEnumeration
}
}
public static PooledEnumerable<NetState> GetClients(Map map, Rectangle2D bounds) =>
PooledEnumerable<NetState>.Instantiate(map, bounds, ClientSelector ?? SelectClients);
public static PooledEnumerable<IEntity> GetEntities(Map map, Rectangle2D bounds) =>
PooledEnumerable<IEntity>.Instantiate(map, bounds, EntitySelector ?? SelectEntities);