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

Fixes dictionary uses (#7)

Browse source
This commit is contained in:
Kamron Batman 2018-11-02 08:16:42 -07:00 • committed by GitHub
parent d4a52344f2
commit 916d404c51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
161 changed files with 1211 additions and 1722 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -258,14 +258,10 @@ namespace Server.Mobiles
if (dest == null)
return false;
Mobile escorter = GetEscorter();
if (escorter != null || !m.Alive)
if (GetEscorter() != null || !m.Alive)
return false;
BaseEscortable escortable = EscortTable[m];
if (escortable?.Deleted == false && escortable.GetEscorter() == m)
if (EscortTable.TryGetValue(m, out BaseEscortable escortable) && escortable?.Deleted == false && escortable.GetEscorter() == m)
{
Say("I see you already have an escort.");
return false;
@ -693,7 +689,8 @@ namespace Server.Mobiles
if (name == null || m_Table == null)
return null;
return m_Table[name];
m_Table.TryGetValue(name, out EscortDestinationInfo info);
return info;
}
}