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

1
Scripts/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

1
Scripts/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

17
Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs
View file

@ -9,12 +9,8 @@ namespace Server.Mobiles
private bool m_Stunning;
[Constructible]
public Golem() : this(false, 1.0)
{
}
[Constructible]
public Golem(bool summoned, double scalar) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.4, 0.8)
public Golem(bool summoned = false, double scalar = 1.0) :
base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.4, 0.8)
{
Body = 752;
@ -192,12 +188,9 @@ namespace Server.Mobiles
{
if (Controlled || Summoned)
{
Mobile master = ControlMaster;
Mobile master = ControlMaster ?? SummonMaster;
if (master == null)
master = SummonMaster;
if (master != null && master.Player && master.Map == Map && master.InRange(Location, 20))
if (master?.Player == true && master.Map == Map && master.InRange(Location, 20))
{
if (master.Mana >= amount)
{
@ -227,4 +220,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

10
Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs
View file

@ -205,10 +205,10 @@ namespace Server.Mobiles
foreach (Corpse item in eable)
// Ensure that the corpse was killed by us
if (item.Killer == this && item.Owner != null)
if (!item.DevourCorpse() && !item.Devoured)
PublicOverheadMessage(MessageType.Emote, 0x3B2,
1053032); // * The plague beast attempts to absorb the remains, but cannot! *
if (item.Killer == this && item.Owner != null && !item.DevourCorpse() && !item.Devoured)
PublicOverheadMessage(MessageType.Emote, 0x3B2,
1053032); // * The plague beast attempts to absorb the remains, but cannot! *
eable.Free();
}
@ -245,4 +245,4 @@ namespace Server.Mobiles
}
}
}
}
}

6
Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs
View file

@ -92,7 +92,7 @@ namespace Server.Mobiles
{
Mobile m = state.Mobile;
if (m != null && m.Player && m != from)
if (m?.Player == true && m != from)
PrivateOverheadMessage(MessageType.Regular, 0x3B2, 1071919, from.Name,
m.NetState); // * ~1_VAL~ slices through the plague beast's amorphous tissue *
}
@ -305,7 +305,7 @@ namespace Server.Mobiles
protected override void OnTick()
{
if (m_Lord == null || m_Lord.Deleted)
if (m_Lord?.Deleted != false)
{
Stop();
return;
@ -350,4 +350,4 @@ namespace Server.Mobiles
}
}
}
}
}

10
Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs
View file

@ -6,12 +6,8 @@ namespace Server.Mobiles
{
public class PlagueSpawn : BaseCreature
{
[Constructible]
public PlagueSpawn() : this(null)
{
}
public PlagueSpawn(Mobile owner) : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4)
public PlagueSpawn(Mobile owner = null) :
base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4)
{
Owner = owner;
ExpireTime = DateTime.UtcNow + TimeSpan.FromMinutes(1.0);
@ -132,4 +128,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Mobiles/Monsters/Misc/Melee/SandVortex.cs
View file

@ -57,7 +57,7 @@ namespace Server.Mobiles
{
Mobile combatant = Combatant;
if (combatant == null || combatant.Deleted || combatant.Map != Map || !InRange(combatant, 12) ||
if (combatant?.Deleted != false || combatant.Map != Map || !InRange(combatant, 12) ||
!CanBeHarmful(combatant) || !InLOS(combatant))
return;
@ -109,4 +109,4 @@ namespace Server.Mobiles
}
}
}
}
}