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

23
Scripts/Spells/Mysticism/SpellPlagueSpell.cs
View file

@ -67,11 +67,8 @@ namespace Server.Spells.Mysticism
SpellPlagueContext context = new SpellPlagueContext(this, targeted);
if (m_Table.ContainsKey(targeted))
{
SpellPlagueContext oldContext = m_Table[targeted];
if (m_Table.TryGetValue(targeted, out SpellPlagueContext oldContext))
oldContext.SetNext(context);
}
else
{
m_Table[targeted] = context;
@ -89,22 +86,14 @@ namespace Server.Spells.Mysticism
public static void RemoveEffect(Mobile m)
{
if (!m_Table.ContainsKey(m))
return;
SpellPlagueContext context = m_Table[m];
context.EndPlague(false);
if (m_Table.TryGetValue(m, out SpellPlagueContext context))
context.EndPlague(false);
}
public static void CheckPlague(Mobile m)
{
if (!m_Table.ContainsKey(m))
return;
SpellPlagueContext context = m_Table[m];
context.OnDamage();
if (m_Table.TryGetValue(m, out SpellPlagueContext context))
context.OnDamage();
}
private static void OnPlayerDeath(PlayerDeathEventArgs e)
@ -225,4 +214,4 @@ namespace Server.Spells.Mysticism
}
}
}
}
}

8
Scripts/Spells/Mysticism/StoneFormSpell.cs
View file

@ -142,7 +142,8 @@ namespace Server.Spells.Mysticism
public static void RemoveEffects(Mobile m)
{
ResistanceMod[] mods = m_Table[m];
if (!m_Table.TryGetValue(m, out ResistanceMod[] mods))
return;
for (int i = 0; i < mods.Length; ++i)
m.RemoveResistanceMod(mods[i]);
@ -157,10 +158,7 @@ namespace Server.Spells.Mysticism
private static void OnPlayerDeath(PlayerDeathEventArgs e)
{
Mobile m = e.Mobile;
if (UnderEffect(m))
RemoveEffects(m);
RemoveEffects(e.Mobile);
}
}
}