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

fix(linq): Removes linq and fixes fishing error (#674)

Browse source
This commit is contained in:
Kamron Batman 2021-08-04 22:24:38 -07:00 • committed by GitHub
parent b112be4e1f
commit 410b18ceca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 253 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -709,11 +709,21 @@ namespace Server.Multis
public override bool InRange(IPoint2D from, int range)
{
return Region?.Area.Any(
rect =>
from.X >= rect.Start.X - range && from.Y >= rect.Start.Y - range && from.X < rect.End.X + range &&
from.Y < rect.End.Y + range
) == true;
if (Region == null)
{
return false;
}
foreach (var rect in Region.Area)
{
if (from.X >= rect.Start.X - range && from.Y >= rect.Start.Y - range && from.X < rect.End.X + range && from.Y < rect.End.Y + range)
{
return true;
}
}
return false;
}
public virtual int GetNewVendorSystemMaxVendors()
@ -766,8 +776,18 @@ namespace Server.Multis
public List<Mobile> AvailableVendorsFor(Mobile m) =>
PlayerVendors.Where(vendor => vendor.CanInteractWith(m, false)).ToList<Mobile>();
public bool AreThereAvailableVendorsFor(Mobile m) =>
PlayerVendors.Any(vendor => vendor.CanInteractWith(m, false));
public bool AreThereAvailableVendorsFor(Mobile m)
{
foreach (var vendor in PlayerVendors)
{
if (vendor.CanInteractWith(m, false))
{
return true;
}
}
return false;
}
public void MoveAllToCrate()
{
@ -3446,8 +3466,23 @@ namespace Server.Multis
AllHouses.Remove(this);
}
public static bool HasHouse(Mobile m) =>
m != null && m_Table.TryGetValue(m, out var list) && list.Any(h => !h.Deleted);
public static bool HasHouse(Mobile m)
{
if (m == null || !m_Table.TryGetValue(m, out var list))
{
return false;
}
foreach (var h in list)
{
if (!h.Deleted)
{
return true;
}
}
return false;
}
public static bool HasAccountHouse(Mobile m)
{

24
Projects/UOContent/Multis/Houses/ContestHouses.cs
View file

@ -137,8 +137,28 @@ namespace Server.Multis
Fixtures.Add(item);
}
public override bool IsInside(Point3D p, int height) =>
base.IsInside(p, height) || Fixtures?.OfType<HouseTeleporter>().Any(fix => fix.Location == p) == true;
public override bool IsInside(Point3D p, int height)
{
if (base.IsInside(p, height))
{
return true;
}
if (Fixtures == null)
{
return false;
}
foreach (Item fixture in Fixtures)
{
if (fixture is HouseTeleporter fix && fix.Location == p)
{
return true;
}
}
return false;
}
public virtual void AutoAddFixtures()
{