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

8
Scripts/Multis/MovingCrate.cs
View file

@ -141,12 +141,12 @@ namespace Server.Multis
public override bool CheckLift(Mobile from, Item item, ref LRReason reject)
{
return base.CheckLift(from, item, ref reject) && House != null && !House.Deleted && House.IsOwner(from);
return House?.Deleted == false && base.CheckLift(from, item, ref reject) && House.IsOwner(from);
}
public override bool CheckItemUse(Mobile from, Item item)
{
return base.CheckItemUse(from, item) && House != null && !House.Deleted && House.IsOwner(from);
return House?.Deleted == false && base.CheckItemUse(from, item) && House.IsOwner(from);
}
public override void OnItemRemoved(Item item)
@ -197,7 +197,7 @@ namespace Server.Multis
{
base.OnAfterDelete();
if (House != null && House.MovingCrate == this)
if (House?.MovingCrate == this)
House.MovingCrate = null;
m_InternalizeTimer?.Stop();
@ -311,4 +311,4 @@ namespace Server.Multis
MaxItems = -1; // reset to default
}
}
}
}