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

Adds better type support for pooled enumerables. Refactors code. (#16)

Browse source
This commit is contained in:
Kamron Batman 2018-08-09 14:08:34 -07:00 • committed by GitHub
parent 62b95f4d74
commit b06f5bf60d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 252 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Scripts/Multis/BaseHouse.cs
View file

@ -448,7 +448,7 @@ namespace Server.Multis
vendor = false;
rentalContract = false;
IPooledEnumerable eable = map.GetObjectsInRange( location, 0 );
IPooledEnumerable<IEntity> eable = map.GetObjectsInRange( location, 0 );
foreach ( IEntity entity in eable )
{
@ -902,7 +902,7 @@ namespace Server.Multis
List<Item> list = new List<Item>();
IPooledEnumerable eable = this.Map.GetItemsInBounds( rect );
IPooledEnumerable<Item> eable = this.Map.GetItemsInBounds( rect );
foreach ( Item item in eable )
if ( item.Movable && IsInside( item ) )
@ -1689,7 +1689,7 @@ namespace Server.Multis
bool valid = m_House != null && Sextant.Format( m_House.Location, m_House.Map, ref xLong, ref yLat, ref xMins, ref yMins, ref xEast, ref ySouth );
if ( valid )
location = String.Format( "{0}° {1}'{2}, {3}° {4}'{5}", yLat, yMins, ySouth ? "S" : "N", xLong, xMins, xEast ? "E" : "W" );
location = String.Format( "{0}° {1}'{2}, {3}° {4}'{5}", yLat, yMins, ySouth ? "S" : "N", xLong, xMins, xEast ? "E" : "W" );
else
location = "unknown";
@ -3465,14 +3465,14 @@ namespace Server.Multis
return null;
MultiComponentList mcl = Components;
IPooledEnumerable eable = map.GetItemsInBounds( new Rectangle2D( X + mcl.Min.X, Y + mcl.Min.Y, mcl.Width, mcl.Height ) );
IPooledEnumerable<Guildstone> eable = map.GetItemsInBounds<Guildstone>( new Rectangle2D( X + mcl.Min.X, Y + mcl.Min.Y, mcl.Width, mcl.Height ) );
foreach ( Item item in eable )
foreach ( Guildstone item in eable )
{
if ( item is Guildstone && Contains( item ) )
if ( Contains( item ) )
{
eable.Free();
return (Guildstone)item;
return item;
}
}
@ -3976,4 +3976,4 @@ namespace Server.Multis
return ( from == m_RegionOwner || AccountHandler.CheckAccount( from, m_RegionOwner ) );
}
}
}
}