From 647d6c0fd09a8fccfe37cc9434aa25d8830a919d Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Sat, 3 Nov 2018 18:07:35 -0700 Subject: [PATCH] Fixes small compile errors for both Mono and Windows --- Scripts/Items/Food/Beverage.cs | 5 +++-- Scripts/Mobiles/PlayerMobile.cs | 8 ++------ Server/packages.config | 8 ++++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Scripts/Items/Food/Beverage.cs b/Scripts/Items/Food/Beverage.cs index af564855b..2c54548a4 100644 --- a/Scripts/Items/Food/Beverage.cs +++ b/Scripts/Items/Food/Beverage.cs @@ -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); diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs index f1ecc1494..8646e6f6e 100644 --- a/Scripts/Mobiles/PlayerMobile.cs +++ b/Scripts/Mobiles/PlayerMobile.cs @@ -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) diff --git a/Server/packages.config b/Server/packages.config index c697f90c1..8e1dc78d7 100644 --- a/Server/packages.config +++ b/Server/packages.config @@ -7,7 +7,7 @@ - - - - \ No newline at end of file + + + + \ No newline at end of file