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

4
Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs
View file

@ -145,7 +145,7 @@ namespace Server.Mobiles
{
Mobile combatant = Combatant;
if (DateTime.UtcNow < m_NextAbilityTime || combatant == null || combatant.Deleted || combatant.Map != Map ||
if (DateTime.UtcNow < m_NextAbilityTime || combatant?.Deleted != false || combatant.Map != Map ||
!InRange(combatant, 3) || !CanBeHarmful(combatant) || !InLOS(combatant))
return;
@ -176,4 +176,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

7
Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs
View file

@ -65,14 +65,15 @@ namespace Server.Mobiles
public override void OnDamagedBySpell(Mobile from)
{
if (from != null && from.Alive && 0.4 > Utility.RandomDouble()) ThrowHatchet(from);
if (from?.Alive == true && 0.4 > Utility.RandomDouble())
ThrowHatchet(from);
}
public override void OnGotMeleeAttack(Mobile attacker)
{
base.OnGotMeleeAttack(attacker);
if (attacker != null && attacker.Alive && attacker.Weapon is BaseRanged && 0.4 > Utility.RandomDouble())
if (attacker?.Alive == true && attacker.Weapon is BaseRanged && 0.4 > Utility.RandomDouble())
ThrowHatchet(attacker);
}
@ -96,4 +97,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs
View file

@ -1,7 +1,5 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Server.Items;
using Server.Spells;

2
Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs
View file

@ -1,5 +1,3 @@
using System.Collections;
namespace Server.Mobiles
{
public class Succubus : BaseCreature

4
Scripts/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs
View file

@ -94,7 +94,7 @@ namespace Server.Mobiles
break;
}
Utility.AssignRandomHair(this, true);
Utility.AssignRandomHair(this);
}
public ElfBrigand(Serial serial) : base(serial)
@ -132,4 +132,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

1
Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs
View file

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

4
Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs
View file

@ -98,7 +98,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;
@ -154,4 +154,4 @@ namespace Server.Mobiles
}
}
}
}
}

6
Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs
View file

@ -110,16 +110,16 @@ namespace Server.Mobiles
return;
IPooledEnumerable<OrcishLord> eable = GetMobilesInRange<OrcishLord>(10);
int orcs = eable.Count();
eable.Free();
if (orcs < 10)
if (eable.Count() < 10)
{
BaseCreature orc = new SpawnedOrcishLord{ Team = Team };
orc.MoveToWorld(map.GetRandomNearbyLocation(target.Location), map);
orc.Combatant = target;
}
eable.Free();
}
public override void Serialize(GenericWriter writer)