Fixes small compile errors for both Mono and Windows

This commit is contained in:
Kamron Batman 2018-11-03 18:07:35 -07:00
parent 916d404c51
commit 647d6c0fd0
3 changed files with 9 additions and 12 deletions

View file

@ -1104,6 +1104,7 @@ namespace Server.Items
public static void CheckHeaveTimer(Mobile from)
{
Timer t;
if (from.BAC > 0 && from.Map != Map.Internal && !from.Deleted)
{
if (m_Table.ContainsKey(from))
@ -1112,12 +1113,12 @@ namespace Server.Items
if (from.BAC > 60)
from.BAC = 60;
Timer t = new HeaveTimer(from);
t = new HeaveTimer(from);
t.Start();
m_Table[from] = t;
}
else if (m_Table.TryGetValue(from, out Timer t))
else if (m_Table.TryGetValue(from, out t))
{
t.Stop();
m_Table.Remove(from);

View file

@ -4728,16 +4728,12 @@ namespace Server.Mobiles
public virtual bool HasRecipe(Recipe r)
{
if (r == null)
return false;
return HasRecipe(r.ID);
return r != null && HasRecipe(r.ID);
}
public virtual bool HasRecipe(int recipeID)
{
m_AcquiredRecipes?.TryGetValue(recipeID, out bool value);
return value;
return m_AcquiredRecipes.TryGetValue(recipeID, out bool value) && value;
}
public virtual void AcquireRecipe(Recipe r)