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

C# 9 Cleanup (#325)

Browse source 
- [X] Removes EventArgs - not needed
- [X] Merges sequential checks
- [X] Removes redundant type declarations
This commit is contained in:
Kamron Batman 2020-11-27 00:29:21 -08:00 • committed by GitHub
parent 351611a23a
commit 3551d962f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
417 changed files with 2209 additions and 2213 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/UOContent/Mobiles/AI/BaseAI.cs
View file

@ -94,7 +94,7 @@ namespace Server.Mobiles
SkillName.Meditation
};
private static readonly Queue<Item> m_Obstacles = new Queue<Item>();
private static readonly Queue<Item> m_Obstacles = new();
protected ActionType m_Action;
public BaseCreature m_Mobile;
@ -380,8 +380,7 @@ namespace Server.Mobiles
var skill = ourSkills[i];
var theirSkill = theirSkills[i];
if (skill != null && skill.Base >= 60.0 &&
m_Mobile.CheckTeach(skill.SkillName, e.Mobile))
if (skill?.Base >= 60.0 && m_Mobile.CheckTeach(skill.SkillName, e.Mobile))
{
var toTeach = skill.Base / 3.0;

6
Projects/UOContent/Mobiles/AI/OppositionGroup.cs
View file

@ -9,7 +9,7 @@ namespace Server
public OppositionGroup(Type[][] types) => m_Types = types;
public static OppositionGroup TerathansAndOphidians { get; } = new OppositionGroup(
public static OppositionGroup TerathansAndOphidians { get; } = new(
new[]
{
new[]
@ -30,7 +30,7 @@ namespace Server
}
);
public static OppositionGroup SavagesAndOrcs { get; } = new OppositionGroup(
public static OppositionGroup SavagesAndOrcs { get; } = new(
new[]
{
new[]
@ -53,7 +53,7 @@ namespace Server
}
);
public static OppositionGroup FeyAndUndead { get; } = new OppositionGroup(
public static OppositionGroup FeyAndUndead { get; } = new(
new[]
{
new[]

8
Projects/UOContent/Mobiles/AI/SpeedInfo.cs
View file

@ -15,7 +15,7 @@ namespace Server
private static readonly SpeedInfo[] m_Speeds =
{
/* Slow */
new SpeedInfo(
new(
0.3,
0.6,
new[]
@ -34,7 +34,7 @@ namespace Server
}
),
/* Fast */
new SpeedInfo(
new(
0.2,
0.4,
new[]
@ -61,7 +61,7 @@ namespace Server
}
),
/* Very Fast */
new SpeedInfo(
new(
0.175,
0.350,
new[]
@ -78,7 +78,7 @@ namespace Server
}
),
/* Medium */
new SpeedInfo(
new(
0.25,
0.5,
new[]