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

50
Scripts/Items/Games/Mahjong/MahjongPlayers.cs
View file

@ -144,47 +144,47 @@ namespace Server.Engines.Mahjong
{
Mobile player = m_Players[i];
if (player != null)
if (player == null)
continue;
if (player.Deleted)
{
if (player.Deleted)
m_Players[i] = null;
SendPlayerExitMessage(player);
UpdateDealer(true);
removed = true;
}
else if (m_InGame[i])
{
if (player.NetState == null)
{
m_Players[i] = null;
m_InGame[i] = false;
SendPlayerExitMessage(player);
UpdateDealer(true);
removed = true;
}
else if (m_InGame[i])
else if (!Game.IsAccessibleTo(player) || player.Map != Game.Map ||
!player.InRange(Game.GetWorldLocation(), 5))
{
if (player.NetState == null)
{
m_InGame[i] = false;
m_InGame[i] = false;
SendPlayerExitMessage(player);
UpdateDealer(true);
player.Send(new MahjongRelieve(Game));
removed = true;
}
else if (!Game.IsAccessibleTo(player) || player.Map != Game.Map ||
!player.InRange(Game.GetWorldLocation(), 5))
{
m_InGame[i] = false;
SendPlayerExitMessage(player);
UpdateDealer(true);
player.Send(new MahjongRelieve(Game));
SendPlayerExitMessage(player);
UpdateDealer(true);
removed = true;
}
removed = true;
}
}
}
for (int i = 0; i < m_Spectators.Count;)
{
Mobile mobile = (Mobile)m_Spectators[i];
Mobile mobile = m_Spectators[i];
if (mobile.NetState == null || mobile.Deleted)
{
@ -257,7 +257,7 @@ namespace Server.Engines.Mahjong
if (nextSeat >= 0)
{
Mobile newPlayer = (Mobile)m_Spectators[0];
Mobile newPlayer = m_Spectators[0];
m_Spectators.RemoveAt(0);
@ -502,4 +502,4 @@ namespace Server.Engines.Mahjong
writer.Write(DealerPosition);
}
}
}
}