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

21
Scripts/Mobiles/Townfolk/BaseEscortable.cs
View file

@ -302,15 +302,13 @@ namespace Server.Mobiles
{
base.OnSpeech(e);
EDI dest = GetDestination();
if (GetDestination() == null || e.Handled || !e.Mobile.InRange(Location, 3))
return;
if (dest != null && !e.Handled && e.Mobile.InRange(Location, 3))
{
if (e.HasKeyword(0x1D)) // *destination*
e.Handled = SayDestinationTo(e.Mobile);
else if (e.HasKeyword(0x1E)) // *i will take thee*
e.Handled = AcceptEscorter(e.Mobile);
}
if (e.HasKeyword(0x1D)) // *destination*
e.Handled = SayDestinationTo(e.Mobile);
else if (e.HasKeyword(0x1E)) // *i will take thee*
e.Handled = AcceptEscorter(e.Mobile);
}
public override void OnAfterDelete()
@ -600,7 +598,7 @@ namespace Server.Mobiles
picked = possible[Utility.Random(possible.Length)];
EDI test = EDI.Find(picked);
if (test != null && test.Contains(Location))
if (test.Contains(Location))
picked = null;
}
@ -673,10 +671,7 @@ namespace Server.Mobiles
foreach (Region r in list)
{
if (r.Name == null)
continue;
if (r is DungeonRegion || r is TownRegion)
if (r.Name != null && (r is DungeonRegion || r is TownRegion))
m_Table[r.Name] = new EscortDestinationInfo(r.Name, r);
}
}