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/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs
View file

@ -1,3 +1,5 @@
using System.Linq;
namespace Server.Mobiles
{
public class InterredGrizzle : BaseCreature
@ -134,16 +136,8 @@ namespace Server.Mobiles
for (int j = 0; j < 5; j++)
{
p = GetSpawnPosition(2);
bool found = false;
foreach (Item item in Map.GetItemsInRange(p, 0))
if (item is StainedOoze)
{
found = true;
break;
}
if (!found)
if (!Map.GetItemsInRange(p, 0).OfType<StainedOoze>().Any())
break;
}
@ -171,4 +165,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

13
Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs
View file

@ -116,11 +116,8 @@ namespace Server.Mobiles
public bool IsValidTarget(PlayerMobile m)
{
if (m != null && m.PeacedUntil < DateTime.UtcNow && !m.Hidden && m.AccessLevel == AccessLevel.Player &&
CanBeHarmful(m))
return true;
return false;
return m?.PeacedUntil < DateTime.UtcNow && !m.Hidden && m.AccessLevel == AccessLevel.Player &&
CanBeHarmful(m);
}
#endregion
@ -135,7 +132,7 @@ namespace Server.Mobiles
return;
foreach (Mobile m in GetMobilesInRange(RangePerception))
if (m != null && m.Player && !m.Female && !m.Hidden && m.AccessLevel == AccessLevel.Player &&
if (m?.Player == true && !m.Female && !m.Hidden && m.AccessLevel == AccessLevel.Player &&
CanBeHarmful(m))
{
UndressItem(m, Layer.OuterTorso);
@ -155,10 +152,10 @@ namespace Server.Mobiles
{
Item item = m.FindItemOnLayer(layer);
if (item != null && item.Movable)
if (item?.Movable == true)
m.PlaceInBackpack(item);
}
#endregion
}
}
}