1 files changed, 39 insertions, 0 deletions
diff --git a/src/SMAPI/Patches/ObjectErrorPatch.cs b/src/SMAPI/Patches/ObjectErrorPatch.cs
index d716b29b..d3b8800a 100644
--- a/src/SMAPI/Patches/ObjectErrorPatch.cs
+++ b/src/SMAPI/Patches/ObjectErrorPatch.cs
@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 using Harmony;
 using StardewModdingAPI.Framework.Patching;
 using StardewValley;
@@ -33,6 +35,12 @@ namespace StardewModdingAPI.Patches
                 prefix: new HarmonyMethod(this.GetType(), nameof(ObjectErrorPatch.Before_Object_GetDescription))
             );
 
+            // object.getDisplayName
+            harmony.Patch(
+                original: AccessTools.Method(typeof(SObject), "loadDisplayName"),
+                prefix: new HarmonyMethod(this.GetType(), nameof(ObjectErrorPatch.Before_Object_loadDisplayName))
+            );
+
             // IClickableMenu.drawToolTip
             harmony.Patch(
                 original: AccessTools.Method(typeof(IClickableMenu), nameof(IClickableMenu.drawToolTip)),
@@ -60,6 +68,37 @@ namespace StardewModdingAPI.Patches
             return true;
         }
 
+        /// <summary>The method to call instead of <see cref="StardewValley.Object.loadDisplayName"/>.</summary>
+        /// <param name="__instance">The instance being patched.</param>
+        /// <param name="__result">The patched method's return value.</param>
+        /// <param name="__originalMethod">The method being wrapped.</param>
+        /// <returns>Returns whether to execute the original method.</returns>
+        private static bool Before_Object_loadDisplayName(SObject __instance, ref string __result, MethodInfo __originalMethod)
+        {
+            const string key = nameof(Before_Object_loadDisplayName);
+            if (!PatchHelper.StartIntercept(key))
+                return true;
+
+            try
+            {
+                __result = (string)__originalMethod.Invoke(__instance, new object[0]);
+                return false;
+            }
+            catch (TargetInvocationException ex) when (ex.InnerException is KeyNotFoundException)
+            {
+                __result = "???";
+                return false;
+            }
+            catch
+            {
+                return true;
+            }
+            finally
+            {
+                PatchHelper.StopIntercept(key);
+            }
+        }
+
         /// <summary>The method to call instead of <see cref="IClickableMenu.drawToolTip"/>.</summary>
         /// <param name="__instance">The instance being patched.</param>
         /// <param name="hoveredItem">The item for which to draw a tooltip.</param>