From c531acb6599b4e115e8b6f6d12e9194b3f83ff9d Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 29 Sep 2018 18:30:14 -0400
Subject: fix command errors logged as SMAPI instead of the affected mod

---
 src/SMAPI/Framework/ModHelpers/CommandHelper.cs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/SMAPI/Framework/ModHelpers')

diff --git a/src/SMAPI/Framework/ModHelpers/CommandHelper.cs b/src/SMAPI/Framework/ModHelpers/CommandHelper.cs
index bdedb07c..5a3304f3 100644
--- a/src/SMAPI/Framework/ModHelpers/CommandHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/CommandHelper.cs
@@ -8,8 +8,8 @@ namespace StardewModdingAPI.Framework.ModHelpers
         /*********
         ** Accessors
         *********/
-        /// <summary>The friendly mod name for this instance.</summary>
-        private readonly string ModName;
+        /// <summary>The mod using this instance.</summary>
+        private readonly IModMetadata Mod;
 
         /// <summary>Manages console commands.</summary>
         private readonly CommandManager CommandManager;
@@ -19,13 +19,12 @@ namespace StardewModdingAPI.Framework.ModHelpers
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
-        /// <param name="modID">The unique ID of the relevant mod.</param>
-        /// <param name="modName">The friendly mod name for this instance.</param>
+        /// <param name="mod">The mod using this instance.</param>
         /// <param name="commandManager">Manages console commands.</param>
-        public CommandHelper(string modID, string modName, CommandManager commandManager)
-            : base(modID)
+        public CommandHelper(IModMetadata mod, CommandManager commandManager)
+            : base(mod?.Manifest?.UniqueID ?? "SMAPI")
         {
-            this.ModName = modName;
+            this.Mod = mod;
             this.CommandManager = commandManager;
         }
 
@@ -38,7 +37,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         /// <exception cref="ArgumentException">There's already a command with that name.</exception>
         public ICommandHelper Add(string name, string documentation, Action<string, string[]> callback)
         {
-            this.CommandManager.Add(this.ModName, name, documentation, callback);
+            this.CommandManager.Add(this.Mod, name, documentation, callback);
             return this;
         }
 
-- 
cgit