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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Scripts/Items/Addons/BaseAddon.cs
View file

@ -72,7 +72,7 @@ namespace Server.Items
{
BaseHouse house = BaseHouse.FindHouseAt(this);
if (house != null && house.IsOwner(from) && house.Addons.Contains(this))
if (house?.IsOwner(from) == true && house.Addons.Contains(this))
{
Effects.PlaySound(GetWorldLocation(), Map, 0x3B3);
from.SendLocalizedMessage(500461); // You destroy the item.
@ -165,12 +165,7 @@ namespace Server.Items
public static bool CheckHouse(Mobile from, Point3D p, Map map, int height, ref BaseHouse house)
{
house = BaseHouse.FindHouseAt(p, map, height);
if (house == null || from != null && !house.IsOwner(from))
return false;
return true;
return from == null || BaseHouse.FindHouseAt(p, map, height)?.IsOwner(from) == true;
}
public static bool IsWall(int x, int y, int z, Map map)
@ -277,4 +272,4 @@ namespace Server.Items
#endregion
}
}
}