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

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

170
Server/Items/SecureTradeContainer.cs
View file

@ -23,124 +23,100 @@ using Server.Network;
namespace Server.Items
{
public class SecureTradeContainer : Container
{
public SecureTrade Trade { get; }
public class SecureTradeContainer : Container
{
public SecureTradeContainer(SecureTrade trade) : base(0x1E5E)
{
Trade = trade;
public SecureTradeContainer( SecureTrade trade ) : base( 0x1E5E )
{
Trade = trade;
Movable = false;
}
Movable = false;
}
public SecureTradeContainer(Serial serial) : base(serial)
{
}
public SecureTradeContainer( Serial serial ) : base( serial )
{
}
public SecureTrade Trade{ get; }
public override bool CheckHold( Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight )
{
if (item == Trade.From.VirtualCheck || item == Trade.To.VirtualCheck)
{
return true;
}
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
{
if (item == Trade.From.VirtualCheck || item == Trade.To.VirtualCheck) return true;
Mobile to;
Mobile to;
if ( Trade.From.Container != this )
to = Trade.From.Mobile;
else
to = Trade.To.Mobile;
if (Trade.From.Container != this)
to = Trade.From.Mobile;
else
to = Trade.To.Mobile;
return m.CheckTrade( to, item, this, message, checkItems, plusItems, plusWeight );
}
return m.CheckTrade(to, item, this, message, checkItems, plusItems, plusWeight);
}
public override bool CheckLift( Mobile from, Item item, ref LRReason reject )
{
reject = LRReason.CannotLift;
return false;
}
public override bool CheckLift(Mobile from, Item item, ref LRReason reject)
{
reject = LRReason.CannotLift;
return false;
}
public override bool IsAccessibleTo( Mobile check )
{
if ( !IsChildOf( check ) || Trade == null || !Trade.Valid )
return false;
public override bool IsAccessibleTo(Mobile check)
{
if (!IsChildOf(check) || Trade == null || !Trade.Valid)
return false;
return base.IsAccessibleTo( check );
}
return base.IsAccessibleTo(check);
}
public override void OnItemAdded( Item item )
{
if ( !(item is VirtualCheck) )
{
ClearChecks();
}
}
public override void OnItemAdded(Item item)
{
if (!(item is VirtualCheck)) ClearChecks();
}
public override void OnItemRemoved( Item item )
{
if ( !(item is VirtualCheck) )
{
ClearChecks();
}
}
public override void OnItemRemoved(Item item)
{
if (!(item is VirtualCheck)) ClearChecks();
}
public override void OnSubItemAdded( Item item )
{
if ( !(item is VirtualCheck) )
{
ClearChecks();
}
}
public override void OnSubItemAdded(Item item)
{
if (!(item is VirtualCheck)) ClearChecks();
}
public override void OnSubItemRemoved( Item item )
{
if ( !(item is VirtualCheck) )
{
ClearChecks();
}
}
public override void OnSubItemRemoved(Item item)
{
if (!(item is VirtualCheck)) ClearChecks();
}
public void ClearChecks( )
{
if ( Trade != null )
{
if ( Trade.From != null && !Trade.From.IsDisposed )
{
Trade.From.Accepted = false;
}
public void ClearChecks()
{
if (Trade != null)
{
if (Trade.From != null && !Trade.From.IsDisposed) Trade.From.Accepted = false;
if ( Trade.To != null && !Trade.To.IsDisposed )
{
Trade.To.Accepted = false;
}
if (Trade.To != null && !Trade.To.IsDisposed) Trade.To.Accepted = false;
Trade.Update();
}
}
Trade.Update();
}
}
public override bool IsChildVisibleTo( Mobile m, Item child )
{
if (child is VirtualCheck)
{
return AccountGold.Enabled && (m.NetState == null || !m.NetState.NewSecureTrading);
}
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 base.IsChildVisibleTo(m, child);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}