Fixes dictionary uses (#7)

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

View file

@ -117,9 +117,7 @@ namespace Server.Engines.ConPVP
public static void BeginIgnore(Mobile source, Mobile toIgnore)
{
List<IgnoreEntry> list = m_IgnoreLists[source];
if (list == null)
if (!m_IgnoreLists.TryGetValue(source, out List<IgnoreEntry> list))
m_IgnoreLists[source] = list = new List<IgnoreEntry>();
for (int i = 0; i < list.Count; ++i)
@ -141,9 +139,7 @@ namespace Server.Engines.ConPVP
public static bool IsIgnored(Mobile source, Mobile check)
{
List<IgnoreEntry> list = m_IgnoreLists[source];
if (list == null)
if (!m_IgnoreLists.TryGetValue(source, out List<IgnoreEntry> list))
return false;
for (int i = 0; i < list.Count; ++i)
@ -280,4 +276,4 @@ namespace Server.Engines.ConPVP
}
}
}
}
}

View file

@ -1247,7 +1247,7 @@ namespace Server.Engines.ConPVP
if (mob == null)
return null;
if (!(Players[mob] is BRPlayerInfo val))
if (!Players.TryGetValue(mob, out BRPlayerInfo val))
Players[mob] = val = new BRPlayerInfo(this, mob);
return val;

View file

@ -604,7 +604,7 @@ namespace Server.Engines.ConPVP
if (mob == null)
return null;
if (!(Players[mob] is KHPlayerInfo val))
if (!Players.TryGetValue(mob, out KHPlayerInfo val))
Players[mob] = val = new KHPlayerInfo(this, mob);
return val;

View file

@ -269,9 +269,7 @@ namespace Server.Engines.ConPVP
public LadderEntry Find(Mobile mob)
{
LadderEntry entry = m_Table[mob];
if (entry == null)
if (m_Table.TryGetValue(mob, out LadderEntry entry))
{
m_Table[mob] = entry = new LadderEntry(mob, this);
entry.Index = Entries.Count;
@ -283,7 +281,8 @@ namespace Server.Engines.ConPVP
public LadderEntry FindNoCreate(Mobile mob)
{
return m_Table[mob];
m_Table.TryGetValue(mob, out LadderEntry entry);
return entry;
}
public void Serialize(GenericWriter writer)
@ -364,4 +363,4 @@ namespace Server.Engines.ConPVP
writer.WriteEncodedInt(Losses);
}
}
}
}

View file

@ -107,9 +107,7 @@ namespace Server.Engines.ConPVP
public PreferencesEntry Find(Mobile mob)
{
PreferencesEntry entry = m_Table[mob];
if (entry == null)
if (m_Table.TryGetValue(mob, out PreferencesEntry entry))
{
m_Table[mob] = entry = new PreferencesEntry(mob);
Entries.Add(entry);
@ -276,4 +274,4 @@ namespace Server.Engines.ConPVP
m_ColumnX += width;
}
}
}
}