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

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

188
Server/SecureTrade.cs
View file

@ -30,17 +30,12 @@ namespace Server
{
public class SecureTrade
{
private readonly SecureTradeInfo m_From;
private readonly SecureTradeInfo m_To;
private bool m_Valid;
public SecureTrade(Mobile from, Mobile to)
{
m_Valid = true;
Valid = true;
m_From = new SecureTradeInfo(this, from, new SecureTradeContainer(this));
m_To = new SecureTradeInfo(this, to, new SecureTradeContainer(this));
From = new SecureTradeInfo(this, from, new SecureTradeContainer(this));
To = new SecureTradeInfo(this, to, new SecureTradeContainer(this));
var from6017 = (from.NetState != null && from.NetState.ContainerGridLines);
var to6017 = (to.NetState != null && to.NetState.ContainerGridLines);
@ -49,82 +44,83 @@ namespace Server
var to704565 = (to.NetState != null && to.NetState.NewSecureTrading);
from.Send(new MobileStatus(from, to));
from.Send(new UpdateSecureTrade(m_From.Container, false, false));
from.Send(new UpdateSecureTrade(From.Container, false, false));
if (from6017)
{
from.Send(new SecureTradeEquip6017(m_To.Container, to));
from.Send(new SecureTradeEquip6017(To.Container, to));
}
else
{
from.Send(new SecureTradeEquip(m_To.Container, to));
from.Send(new SecureTradeEquip(To.Container, to));
}
from.Send(new UpdateSecureTrade(m_From.Container, false, false));
from.Send(new UpdateSecureTrade(From.Container, false, false));
if (from6017)
{
from.Send(new SecureTradeEquip6017(m_From.Container, from));
from.Send(new SecureTradeEquip6017(From.Container, from));
}
else
{
from.Send(new SecureTradeEquip(m_From.Container, from));
from.Send(new SecureTradeEquip(From.Container, from));
}
from.Send(new DisplaySecureTrade(to, m_From.Container, m_To.Container, to.Name));
from.Send(new UpdateSecureTrade(m_From.Container, false, false));
from.Send(new DisplaySecureTrade(to, From.Container, To.Container, to.Name));
from.Send(new UpdateSecureTrade(From.Container, false, false));
if (from.Account != null && from704565)
{
from.Send(
new UpdateSecureTrade(m_From.Container, TradeFlag.UpdateLedger, from.Account.TotalGold, from.Account.TotalPlat));
new UpdateSecureTrade(From.Container, TradeFlag.UpdateLedger, from.Account.TotalGold, from.Account.TotalPlat));
}
to.Send(new MobileStatus(to, from));
to.Send(new UpdateSecureTrade(m_To.Container, false, false));
to.Send(new UpdateSecureTrade(To.Container, false, false));
if (to6017)
{
to.Send(new SecureTradeEquip6017(m_From.Container, from));
to.Send(new SecureTradeEquip6017(From.Container, from));
}
else
{
to.Send(new SecureTradeEquip(m_From.Container, from));
to.Send(new SecureTradeEquip(From.Container, from));
}
to.Send(new UpdateSecureTrade(m_To.Container, false, false));
to.Send(new UpdateSecureTrade(To.Container, false, false));
if (to6017)
{
to.Send(new SecureTradeEquip6017(m_To.Container, to));
to.Send(new SecureTradeEquip6017(To.Container, to));
}
else
{
to.Send(new SecureTradeEquip(m_To.Container, to));
to.Send(new SecureTradeEquip(To.Container, to));
}
to.Send(new DisplaySecureTrade(from, m_To.Container, m_From.Container, from.Name));
to.Send(new UpdateSecureTrade(m_To.Container, false, false));
to.Send(new DisplaySecureTrade(from, To.Container, From.Container, from.Name));
to.Send(new UpdateSecureTrade(To.Container, false, false));
if (to.Account != null && to704565)
{
to.Send(new UpdateSecureTrade(m_To.Container, TradeFlag.UpdateLedger, to.Account.TotalGold, to.Account.TotalPlat));
to.Send(new UpdateSecureTrade(To.Container, TradeFlag.UpdateLedger, to.Account.TotalGold, to.Account.TotalPlat));
}
}
public SecureTradeInfo From => m_From;
public SecureTradeInfo To => m_To;
public SecureTradeInfo From { get; }
public bool Valid => m_Valid;
public SecureTradeInfo To { get; }
public bool Valid { get; private set; }
public void Cancel()
{
if (!m_Valid)
if (!Valid)
{
return;
}
var list = m_From.Container.Items;
var list = From.Container.Items;
for (var i = list.Count - 1; i >= 0; --i)
{
@ -132,21 +128,21 @@ namespace Server
{
var item = list[i];
if (item == m_From.VirtualCheck)
if (item == From.VirtualCheck)
{
continue;
}
item.OnSecureTrade(m_From.Mobile, m_To.Mobile, m_From.Mobile, false);
item.OnSecureTrade(From.Mobile, To.Mobile, From.Mobile, false);
if (!item.Deleted)
{
m_From.Mobile.AddToBackpack(item);
From.Mobile.AddToBackpack(item);
}
}
}
list = m_To.Container.Items;
list = To.Container.Items;
for (var i = list.Count - 1; i >= 0; --i)
{
@ -154,16 +150,16 @@ namespace Server
{
var item = list[i];
if (item == m_To.VirtualCheck)
if (item == To.VirtualCheck)
{
continue;
}
item.OnSecureTrade(m_To.Mobile, m_From.Mobile, m_To.Mobile, false);
item.OnSecureTrade(To.Mobile, From.Mobile, To.Mobile, false);
if (!item.Deleted)
{
m_To.Mobile.AddToBackpack(item);
To.Mobile.AddToBackpack(item);
}
}
}
@ -173,36 +169,36 @@ namespace Server
public void Close()
{
if (!m_Valid)
if (!Valid)
{
return;
}
m_From.Mobile.Send(new CloseSecureTrade(m_From.Container));
m_To.Mobile.Send(new CloseSecureTrade(m_To.Container));
From.Mobile.Send(new CloseSecureTrade(From.Container));
To.Mobile.Send(new CloseSecureTrade(To.Container));
m_Valid = false;
Valid = false;
var ns = m_From.Mobile.NetState;
var ns = From.Mobile.NetState;
ns?.RemoveTrade(this);
ns = m_To.Mobile.NetState;
ns = To.Mobile.NetState;
ns?.RemoveTrade(this);
Timer.DelayCall(m_From.Dispose);
Timer.DelayCall(m_To.Dispose);
Timer.DelayCall(From.Dispose);
Timer.DelayCall(To.Dispose);
}
public void UpdateFromCurrency()
{
UpdateCurrency(m_From, m_To);
UpdateCurrency(From, To);
}
public void UpdateToCurrency()
{
UpdateCurrency(m_To, m_From);
UpdateCurrency(To, From);
}
private static void UpdateCurrency(SecureTradeInfo left, SecureTradeInfo right)
@ -223,14 +219,14 @@ namespace Server
public void Update()
{
if (!m_Valid)
if (!Valid)
{
return;
}
if (!m_From.IsDisposed && m_From.Accepted && !m_To.IsDisposed && m_To.Accepted)
if (!From.IsDisposed && From.Accepted && !To.IsDisposed && To.Accepted)
{
var list = m_From.Container.Items;
var list = From.Container.Items;
var allowed = true;
@ -240,19 +236,19 @@ namespace Server
{
var item = list[i];
if (item == m_From.VirtualCheck)
if (item == From.VirtualCheck)
{
continue;
}
if (!item.AllowSecureTrade(m_From.Mobile, m_To.Mobile, m_To.Mobile, true))
if (!item.AllowSecureTrade(From.Mobile, To.Mobile, To.Mobile, true))
{
allowed = false;
}
}
}
list = m_To.Container.Items;
list = To.Container.Items;
for (var i = list.Count - 1; allowed && i >= 0; --i)
{
@ -260,12 +256,12 @@ namespace Server
{
var item = list[i];
if (item == m_To.VirtualCheck)
if (item == To.VirtualCheck)
{
continue;
}
if (!item.AllowSecureTrade(m_To.Mobile, m_From.Mobile, m_From.Mobile, true))
if (!item.AllowSecureTrade(To.Mobile, From.Mobile, From.Mobile, true))
{
allowed = false;
}
@ -274,48 +270,48 @@ namespace Server
if (AccountGold.Enabled)
{
if (m_From.Mobile.Account != null)
if (From.Mobile.Account != null)
{
int totalPlat = m_From.Mobile.Account.TotalPlat;
int totalGold = m_From.Mobile.Account.TotalGold;
int totalPlat = From.Mobile.Account.TotalPlat;
int totalGold = From.Mobile.Account.TotalGold;
if (totalPlat < m_From.Plat || totalGold < m_From.Gold)
if (totalPlat < From.Plat || totalGold < From.Gold)
{
allowed = false;
m_From.Mobile.SendMessage("You do not have enough currency to complete this trade.");
From.Mobile.SendMessage("You do not have enough currency to complete this trade.");
}
}
if (m_To.Mobile.Account != null)
if (To.Mobile.Account != null)
{
int totalPlat = m_To.Mobile.Account.TotalPlat;
int totalGold = m_To.Mobile.Account.TotalGold;
int totalPlat = To.Mobile.Account.TotalPlat;
int totalGold = To.Mobile.Account.TotalGold;
if (totalPlat < m_To.Plat || totalGold < m_To.Gold)
if (totalPlat < To.Plat || totalGold < To.Gold)
{
allowed = false;
m_To.Mobile.SendMessage("You do not have enough currency to complete this trade.");
To.Mobile.SendMessage("You do not have enough currency to complete this trade.");
}
}
}
if (!allowed)
{
m_From.Accepted = false;
m_To.Accepted = false;
From.Accepted = false;
To.Accepted = false;
m_From.Mobile.Send(new UpdateSecureTrade(m_From.Container, m_From.Accepted, m_To.Accepted));
m_To.Mobile.Send(new UpdateSecureTrade(m_To.Container, m_To.Accepted, m_From.Accepted));
From.Mobile.Send(new UpdateSecureTrade(From.Container, From.Accepted, To.Accepted));
To.Mobile.Send(new UpdateSecureTrade(To.Container, To.Accepted, From.Accepted));
return;
}
if (AccountGold.Enabled && m_From.Mobile.Account != null && m_To.Mobile.Account != null)
if (AccountGold.Enabled && From.Mobile.Account != null && To.Mobile.Account != null)
{
HandleAccountGoldTrade();
}
list = m_From.Container.Items;
list = From.Container.Items;
for (var i = list.Count - 1; i >= 0; --i)
{
@ -323,21 +319,21 @@ namespace Server
{
var item = list[i];
if (item == m_From.VirtualCheck)
if (item == From.VirtualCheck)
{
continue;
}
item.OnSecureTrade(m_From.Mobile, m_To.Mobile, m_To.Mobile, true);
item.OnSecureTrade(From.Mobile, To.Mobile, To.Mobile, true);
if (!item.Deleted)
{
m_To.Mobile.AddToBackpack(item);
To.Mobile.AddToBackpack(item);
}
}
}
list = m_To.Container.Items;
list = To.Container.Items;
for (var i = list.Count - 1; i >= 0; --i)
{
@ -345,26 +341,26 @@ namespace Server
{
var item = list[i];
if (item == m_To.VirtualCheck)
if (item == To.VirtualCheck)
{
continue;
}
item.OnSecureTrade(m_To.Mobile, m_From.Mobile, m_From.Mobile, true);
item.OnSecureTrade(To.Mobile, From.Mobile, From.Mobile, true);
if (!item.Deleted)
{
m_From.Mobile.AddToBackpack(item);
From.Mobile.AddToBackpack(item);
}
}
}
Close();
}
else if (!m_From.IsDisposed && !m_To.IsDisposed)
else if (!From.IsDisposed && !To.IsDisposed)
{
m_From.Mobile.Send(new UpdateSecureTrade(m_From.Container, m_From.Accepted, m_To.Accepted));
m_To.Mobile.Send(new UpdateSecureTrade(m_To.Container, m_To.Accepted, m_From.Accepted));
From.Mobile.Send(new UpdateSecureTrade(From.Container, From.Accepted, To.Accepted));
To.Mobile.Send(new UpdateSecureTrade(To.Container, To.Accepted, From.Accepted));
}
}
@ -373,48 +369,48 @@ namespace Server
int fromPlatSend = 0, fromGoldSend = 0, fromPlatRecv = 0, fromGoldRecv = 0;
int toPlatSend = 0, toGoldSend = 0, toPlatRecv = 0, toGoldRecv = 0;
if (m_From.Plat > 0 & m_From.Mobile.Account.WithdrawPlat(m_From.Plat))
if (From.Plat > 0 & From.Mobile.Account.WithdrawPlat(From.Plat))
{
fromPlatSend = m_From.Plat;
fromPlatSend = From.Plat;
if (m_To.Mobile.Account.DepositPlat(m_From.Plat))
if (To.Mobile.Account.DepositPlat(From.Plat))
{
toPlatRecv = fromPlatSend;
}
}
if (m_From.Gold > 0 & m_From.Mobile.Account.WithdrawGold(m_From.Gold))
if (From.Gold > 0 & From.Mobile.Account.WithdrawGold(From.Gold))
{
fromGoldSend = m_From.Gold;
fromGoldSend = From.Gold;
if (m_To.Mobile.Account.DepositGold(m_From.Gold))
if (To.Mobile.Account.DepositGold(From.Gold))
{
toGoldRecv = fromGoldSend;
}
}
if (m_To.Plat > 0 & m_To.Mobile.Account.WithdrawPlat(m_To.Plat))
if (To.Plat > 0 & To.Mobile.Account.WithdrawPlat(To.Plat))
{
toPlatSend = m_To.Plat;
toPlatSend = To.Plat;
if (m_From.Mobile.Account.DepositPlat(m_To.Plat))
if (From.Mobile.Account.DepositPlat(To.Plat))
{
fromPlatRecv = toPlatSend;
}
}
if (m_To.Gold > 0 & m_To.Mobile.Account.WithdrawGold(m_To.Gold))
if (To.Gold > 0 & To.Mobile.Account.WithdrawGold(To.Gold))
{
toGoldSend = m_To.Gold;
toGoldSend = To.Gold;
if (m_From.Mobile.Account.DepositGold(m_To.Gold))
if (From.Mobile.Account.DepositGold(To.Gold))
{
fromGoldRecv = toGoldSend;
}
}
HandleAccountGoldTrade(m_From.Mobile, m_To.Mobile, fromPlatSend, fromGoldSend, fromPlatRecv, fromGoldRecv);
HandleAccountGoldTrade(m_To.Mobile, m_From.Mobile, toPlatSend, toGoldSend, toPlatRecv, toGoldRecv);
HandleAccountGoldTrade(From.Mobile, To.Mobile, fromPlatSend, fromGoldSend, fromPlatRecv, fromGoldRecv);
HandleAccountGoldTrade(To.Mobile, From.Mobile, toPlatSend, toGoldSend, toPlatRecv, toGoldRecv);
}
private static void HandleAccountGoldTrade(