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

14
Scripts/Engines/Ethics/Core/Ethic.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Linq;
using Server.Ethics.Evil;
using Server.Ethics.Hero;
using Server.Items;
@ -126,16 +127,7 @@ namespace Server.Ethics
if (!Insensitive.Equals(ethic.Definition.JoinPhrase.String, e.Speech))
continue;
bool isNearAnkh = false;
foreach (Item item in e.Mobile.GetItemsInRange(2))
if (item is AnkhNorth || item is AnkhWest)
{
isNearAnkh = true;
break;
}
if (!isNearAnkh)
if (!e.Mobile.GetItemsInRange(2).Any(item => item is AnkhNorth || item is AnkhWest))
continue;
pl = new Player(ethic, e.Mobile);
@ -239,4 +231,4 @@ namespace Server.Ethics
m_Players[i].Serialize(writer);
}
}
}
}

4
Scripts/Engines/Ethics/Core/Persistance.cs
View file

@ -8,7 +8,7 @@ namespace Server.Ethics
{
Movable = false;
if (Instance == null || Instance.Deleted)
if (Instance?.Deleted != false)
Instance = this;
else
base.Delete();
@ -56,4 +56,4 @@ namespace Server.Ethics
{
}
}
}
}

4
Scripts/Engines/Ethics/Core/Player.cs
View file

@ -104,7 +104,7 @@ namespace Server.Ethics
Player pl = pm.EthicPlayer;
if (pl != null && !pl.Ethic.IsEligible(pl.Mobile))
if (pl?.Ethic.IsEligible(pl.Mobile) == false)
pm.EthicPlayer = pl = null;
return pl;
@ -157,4 +157,4 @@ namespace Server.Ethics
writer.WriteDeltaTime(m_Shield);
}
}
}
}

4
Scripts/Engines/Ethics/Evil/Powers/SummonFamiliar.cs
View file

@ -18,7 +18,7 @@ namespace Server.Ethics.Evil
public override void BeginInvoke(Player from)
{
if (from.Familiar != null && from.Familiar.Deleted)
if (from.Familiar?.Deleted == true)
from.Familiar = null;
if (from.Familiar != null)
@ -43,4 +43,4 @@ namespace Server.Ethics.Evil
}
}
}
}
}

4
Scripts/Engines/Ethics/Evil/Powers/UnholySteed.cs
View file

@ -18,7 +18,7 @@ namespace Server.Ethics.Evil
public override void BeginInvoke(Player from)
{
if (from.Steed != null && from.Steed.Deleted)
if (from.Steed?.Deleted == true)
from.Steed = null;
if (from.Steed != null)
@ -43,4 +43,4 @@ namespace Server.Ethics.Evil
}
}
}
}
}

4
Scripts/Engines/Ethics/Hero/Powers/HolySteed.cs
View file

@ -18,7 +18,7 @@ namespace Server.Ethics.Hero
public override void BeginInvoke(Player from)
{
if (from.Steed != null && from.Steed.Deleted)
if (from.Steed?.Deleted == true)
from.Steed = null;
if (from.Steed != null)
@ -43,4 +43,4 @@ namespace Server.Ethics.Hero
}
}
}
}
}

4
Scripts/Engines/Ethics/Hero/Powers/SummonFamiliar.cs
View file

@ -18,7 +18,7 @@ namespace Server.Ethics.Hero
public override void BeginInvoke(Player from)
{
if (from.Familiar != null && from.Familiar.Deleted)
if (from.Familiar?.Deleted == true)
from.Familiar = null;
if (from.Familiar != null)
@ -43,4 +43,4 @@ namespace Server.Ethics.Hero
}
}
}
}
}