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

8
Scripts/Engines/Quests/Uzeraan Turmoil/Items/Cannon.cs
View file

@ -64,7 +64,7 @@ namespace Server.Engines.Quests.Haven
[CommandProperty(AccessLevel.GameMaster)]
public MilitiaCanoneer Canoneer{ get; set; }
public override bool HandlesOnMovement => Canoneer != null && !Canoneer.Deleted && Canoneer.Active;
public override bool HandlesOnMovement => Canoneer?.Deleted == false && Canoneer.Active;
public void DoFireEffect(IPoint3D target)
{
@ -101,7 +101,7 @@ namespace Server.Engines.Quests.Haven
public override void OnMovement(Mobile m, Point3D oldLocation)
{
if (Canoneer == null || Canoneer.Deleted || !Canoneer.Active)
if (!(Canoneer?.Deleted == false && Canoneer.Active))
return;
bool canFire;
@ -127,7 +127,7 @@ namespace Server.Engines.Quests.Haven
public override void Serialize(GenericWriter writer)
{
if (Canoneer != null && Canoneer.Deleted)
if (Canoneer?.Deleted == true)
Canoneer = null;
base.Serialize(writer);
@ -183,4 +183,4 @@ namespace Server.Engines.Quests.Haven
int version = reader.ReadInt();
}
}
}
}

10
Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs
View file

@ -133,13 +133,13 @@ namespace Server.Engines.Quests.Haven
public override void OnLocationChange(Point3D oldLoc)
{
if (m_Lantern != null && !m_Lantern.Deleted)
if (m_Lantern?.Deleted == false)
m_Lantern.Location = new Point3D(X, Y + 1, Z);
}
public override void OnMapChange()
{
if (m_Lantern != null && !m_Lantern.Deleted)
if (m_Lantern?.Deleted == false)
m_Lantern.Map = Map;
}
@ -147,13 +147,13 @@ namespace Server.Engines.Quests.Haven
{
base.OnAfterDelete();
if (m_Lantern != null && !m_Lantern.Deleted)
if (m_Lantern?.Deleted == false)
m_Lantern.Delete();
}
public override void Serialize(GenericWriter writer)
{
if (m_Lantern != null && m_Lantern.Deleted)
if (m_Lantern?.Deleted == true)
m_Lantern = null;
base.Serialize(writer);
@ -172,4 +172,4 @@ namespace Server.Engines.Quests.Haven
m_Lantern = (Lantern)reader.ReadItem();
}
}
}
}

4
Scripts/Engines/Quests/Uzeraan Turmoil/Objectives.cs
View file

@ -404,7 +404,7 @@ namespace Server.Engines.Quests.Haven
public override void ChildSerialize(GenericWriter writer)
{
if (CorpseWithBone != null && CorpseWithBone.Deleted)
if (CorpseWithBone?.Deleted == true)
CorpseWithBone = null;
writer.WriteEncodedInt(0); // version
@ -432,4 +432,4 @@ namespace Server.Engines.Quests.Haven
System.AddConversation(new BankerConversation());
}
}
}
}