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

Some cleanup of contains keys and try get values (#246)

Browse source
This commit is contained in:
Kamron Batman 2020-09-13 20:20:44 -07:00 • committed by GitHub
parent 9cbb0cfd23
commit a236617ad9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 3508 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Projects/UOContent/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -107,10 +107,9 @@ namespace Server.Items
public static void EndDelay(Mobile m)
{
if (m_Delay.TryGetValue(m, out var timer))
if (m_Delay.Remove(m, out var timer))
{
timer.Stop();
m_Delay.Remove(m);
}
}

3
Projects/UOContent/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs
View file

@ -123,10 +123,9 @@ namespace Server.Items
public static void EndDelay(Mobile m)
{
if (m_Delay.TryGetValue(m, out var timer))
if (m_Delay.Remove(m, out var timer))
{
timer.Stop();
m_Delay.Remove(m);
}
}

6
Projects/UOContent/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs
View file

@ -66,12 +66,14 @@ namespace Server.Items
public static void RemoveTimer(Mobile m, bool interrupted = false)
{
if (m_Table.TryGetValue(m, out var timer))
if (m_Table.Remove(m, out var timer))
{
if (interrupted)
{
m.SendLocalizedMessage(1073187); // The invisibility effect is interrupted.
}
timer.Stop();
m_Table.Remove(m);
}
}

3
Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs
View file

@ -283,10 +283,9 @@ namespace Server.Items
public static void RemoveTimer(Mobile m)
{
if (Timers.TryGetValue(m, out var t))
if (Timers.Remove(m, out var t))
{
t.Stop();
Timers.Remove(m);
}
}