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

46
Server/Items/SecureTradeContainer.cs
View file

@ -42,12 +42,7 @@ namespace Server.Items
{
if (item == Trade.From.VirtualCheck || item == Trade.To.VirtualCheck) return true;
Mobile to;
if (Trade.From.Container != this)
to = Trade.From.Mobile;
else
to = Trade.To.Mobile;
Mobile to = Trade.From.Container != this ? Trade.From.Mobile : Trade.To.Mobile;
return m.CheckTrade(to, item, this, message, checkItems, plusItems, plusWeight);
}
@ -60,49 +55,52 @@ namespace Server.Items
public override bool IsAccessibleTo(Mobile check)
{
if (!IsChildOf(check) || Trade == null || !Trade.Valid)
return false;
return base.IsAccessibleTo(check);
return IsChildOf(check) && Trade?.Valid == true && base.IsAccessibleTo(check);
}
public override void OnItemAdded(Item item)
{
if (!(item is VirtualCheck)) ClearChecks();
if (!(item is VirtualCheck))
ClearChecks();
}
public override void OnItemRemoved(Item item)
{
if (!(item is VirtualCheck)) ClearChecks();
if (!(item is VirtualCheck))
ClearChecks();
}
public override void OnSubItemAdded(Item item)
{
if (!(item is VirtualCheck)) ClearChecks();
if (!(item is VirtualCheck))
ClearChecks();
}
public override void OnSubItemRemoved(Item item)
{
if (!(item is VirtualCheck)) ClearChecks();
if (!(item is VirtualCheck))
ClearChecks();
}
public void ClearChecks()
{
if (Trade != null)
{
if (Trade.From != null && !Trade.From.IsDisposed) Trade.From.Accepted = false;
if (Trade == null)
return;
if (Trade.To != null && !Trade.To.IsDisposed) Trade.To.Accepted = false;
if (Trade.From?.IsDisposed == false)
Trade.From.Accepted = false;
Trade.Update();
}
if (Trade.To?.IsDisposed == false)
Trade.To.Accepted = false;
Trade.Update();
}
public override bool IsChildVisibleTo(Mobile m, Item child)
{
if (child is VirtualCheck) return AccountGold.Enabled && (m.NetState == null || !m.NetState.NewSecureTrading);
return base.IsChildVisibleTo(m, child);
return child is VirtualCheck
? AccountGold.Enabled && m.NetState?.NewSecureTrading != true
: base.IsChildVisibleTo(m, child);
}
public override void Serialize(GenericWriter writer)
@ -119,4 +117,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}