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

Formatting #2 (#59)

Browse source
This commit is contained in:
Kamron Batman 2019-10-05 00:37:03 -07:00 • committed by GitHub
parent 096d39609e
commit 8e9221bb5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
400 changed files with 3688 additions and 5969 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Projects/Scripts/Engines/ConPVP/Games/BombingRun.cs
View file

@ -130,7 +130,7 @@ namespace Server.Engines.ConPVP
{
Mobile m = ns.Mobile;
if (m == null || !m.Player || !m.Alive)
if (m?.Player != true || !m.Alive)
continue;
BRTeamInfo useTeam = m_Game.GetTeamInfo(m);
@ -208,7 +208,7 @@ namespace Server.Engines.ConPVP
private bool CheckCatch(Mobile m, Point3D myLoc)
{
if (m == null || !m.Alive || !m.Player || m_Game == null)
if (m?.Alive != true || !m.Player || m_Game == null)
return false;
if (m_Game.GetTeamInfo(m) == null)
@ -237,7 +237,7 @@ namespace Server.Engines.ConPVP
m_Flying = false;
Visible = true;
if (m == null || !m.Alive || !m.Player || m_Game == null)
if (m?.Alive != true || !m.Player || m_Game == null)
return;
BRTeamInfo useTeam = m_Game.GetTeamInfo(m);
@ -957,11 +957,11 @@ namespace Server.Engines.ConPVP
private const int LabelColor32 = 0xFFFFFF;
private const int BlackColor32 = 0x000000;
// private BRGame m_Game;
// private BRGame m_Game;
public BRBoardGump(Mobile mob, BRGame game, BRTeamInfo section = null) : base(60, 60)
{
// m_Game = game;
// m_Game = game;
BRTeamInfo ourTeam = game.GetTeamInfo(mob);
@ -1482,7 +1482,7 @@ namespace Server.Engines.ConPVP
if (pm.DuelContext == null || pm.DuelContext != m_Context)
return -1;
if (pm.DuelPlayer == null || pm.DuelPlayer.Eliminated)
if (pm.DuelPlayer?.Eliminated != false)
return -1;
return pm.DuelContext.Participants.IndexOf(pm.DuelPlayer.Participant);

2
Projects/Scripts/Engines/ConPVP/Games/CTF.cs
View file

@ -848,7 +848,7 @@ namespace Server.Engines.ConPVP
if (pm.DuelContext == null || pm.DuelContext != m_Context)
return -1;
if (pm.DuelPlayer == null || pm.DuelPlayer.Eliminated)
if (pm.DuelPlayer?.Eliminated != false)
return -1;
return pm.DuelContext.Participants.IndexOf(pm.DuelPlayer.Participant);

6
Projects/Scripts/Engines/ConPVP/Games/DoubleDom.cs
View file

@ -52,12 +52,12 @@ namespace Server.Engines.ConPVP
private const int LabelColor32 = 0xFFFFFF;
private const int BlackColor32 = 0x000000;
// private DDGame m_Game;
// private DDGame m_Game;
public DDBoardGump(Mobile mob, DDGame game, DDTeamInfo section = null)
: base(60, 60)
{
// m_Game = game;
// m_Game = game;
DDTeamInfo ourTeam = game.GetTeamInfo(mob);
@ -499,7 +499,7 @@ namespace Server.Engines.ConPVP
if (pm.DuelContext == null || pm.DuelContext != m_Context)
return -1;
if (pm.DuelPlayer == null || pm.DuelPlayer.Eliminated)
if (pm.DuelPlayer?.Eliminated != false)
return -1;
return pm.DuelContext.Participants.IndexOf(pm.DuelPlayer.Participant);

4
Projects/Scripts/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -104,7 +104,7 @@ namespace Server.Engines.ConPVP
public override bool OnMoveOver(Mobile m)
{
if (m_Game == null || m == null || !m.Alive)
if (m_Game == null || m?.Alive != true)
return base.OnMoveOver(m);
if (CanBeKing(m))
@ -871,7 +871,7 @@ namespace Server.Engines.ConPVP
if (pm.DuelContext == null || pm.DuelContext != m_Context)
return -1;
if (pm.DuelPlayer == null || pm.DuelPlayer.Eliminated)
if (pm.DuelPlayer?.Eliminated != false)
return -1;
return pm.DuelContext.Participants.IndexOf(pm.DuelPlayer.Participant);