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

fix: Removes LINQ from Map.cs (#834)

Browse source 
* Removes LINQ from Map
* Removes broken GetObjectsInRange with items/mobile flags.
This commit is contained in:
Kamron Batman 2021-12-28 14:32:45 -08:00 • committed by GitHub
parent 5019ce9694
commit 284c3d0f34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 833 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Projects/UOContent/Commands/Generic/Implementors/AreaCommandImplementor.cs
View file

@ -43,13 +43,18 @@ namespace Server.Commands.Generic
return;
}
var eable = map.GetObjectsInBounds(rect, items, mobiles);
var eable = map.GetObjectsInBounds(rect);
var objs = new List<object>();
foreach (var obj in eable)
{
if ((!mobiles || obj is not Mobile || BaseCommand.IsAccessible(from, obj)) && ext.IsValid(obj))
if (!mobiles && obj is Mobile || !items && obj is Item)
{
continue;
}
if (BaseCommand.IsAccessible(from, obj) && ext.IsValid(obj))
{
objs.Add(obj);
}

7
Projects/UOContent/Engines/Factions/Core/Faction.cs
View file

@ -273,9 +273,14 @@ namespace Server.Factions
return false;
}
var eable = mob.Map.GetObjectsInRange(mob.Location, range, items, mobs);
var eable = mob.Map.GetObjectsInRange(mob.Location, range);
foreach (var obj in eable)
{
if (!mobs && obj is Mobile || !items && obj is Item)
{
continue;
}
if (type.IsInstanceOfType(obj))
{
eable.Free();

4
Projects/UOContent/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -215,7 +215,7 @@ namespace Server.Items
alchemyBonus = (int)(from.Skills.Alchemy.Value / (Core.AOS ? 5 : 10));
}
var eable = map.GetObjectsInRange(loc, ExplosionRange, LeveledExplosion);
var eable = map.GetObjectsInRange(loc, ExplosionRange);
using var queue = PooledRefQueue<IEntity>.Create();
var toDamage = 0;
@ -234,7 +234,7 @@ namespace Server.Items
queue.Enqueue(entity);
}
}
else if (entity is BaseExplosionPotion)
else if (LeveledExplosion && entity is BaseExplosionPotion)
{
queue.Enqueue(entity);
}