From 4101eacad3e395f024d7b63e0ec578f13dd8f100 Mon Sep 17 00:00:00 2001
From: Durel <aardurel@gmail.com>
Date: Tue, 31 Oct 2017 23:06:03 -0400
Subject: [PATCH] 1) Fixed a case where an item pulled from the frequent cache
 could have the    wrong location.  Instead of using the item's actual
 location, it used the    location of the first item that was put into the
 frequent cache.

---
 aard_inventory.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/aard_inventory.xml b/aard_inventory.xml
index 7e9144a..ac8be82 100644
--- a/aard_inventory.xml
+++ b/aard_inventory.xml
@@ -1063,6 +1063,7 @@ function inv.init.atActiveCR()
       -- fine too.  If refreshes are disabled (their period is 0 minutes) then we skip this.
       if (inv.items.refreshGetPeriods() > 0) then
         dbot.info("Running initial full scan to check if your inventory was modified outside of this plugin")
+        dbot.info("Prompts will be disabled until the scan completes")
         local endTag = inv.tags.new(nil, "Completed initial refresh full scan", nil, inv.tags.cleanup.timed)
         retval = inv.items.refresh(0, invItemsRefreshLocAll, endTag, nil)
         if (retval ~= DRL_RET_SUCCESS) and (retval ~= DRL_RET_UNINITIALIZED) then
@@ -5475,7 +5476,12 @@ function inv.items.identifyCR(maxNumItems, refreshLocations)
     if (idLevel ~= nil) and (idLevel == invIdLevelNone) and (name ~= nil) then
       local cachedEntry = inv.cache.get(inv.cache.frequent.table, name)
       if (cachedEntry ~= nil) then
-        cachedEntry.stats.id = objId
+        -- The cached entry doesn't know the actual location of this object or the object's actual
+        -- object ID.  We overwrite those fields here with the correct values for the item.
+        cachedEntry[invFieldObjLoc] = inv.items.getField(objId, invFieldObjLoc)
+        cachedEntry[invFieldColorName] = colorName
+        cachedEntry[invFieldStats].id = objId
+
         retval = inv.items.setEntry(objId, (cachedEntry))
         if (retval ~= DRL_RET_SUCCESS) then
           dbot.warn("inv.items.identifyCR: Failed to set \"" .. name .. DRL_ANSI_WHITE .. 
@@ -9480,7 +9486,7 @@ function inv.items.trigger.itemDataStats(objId, flags, itemName, level, typeFiel
       retval = inv.items.setField(objId, invFieldObjLoc, tonumber(inv.items.discoverPkg.loc))
     end -- if
 
-    -- Set the colorized name of the
+    -- Set the colorized name of the item
     retval = inv.items.setField(objId, invFieldColorName, itemName)
     if (retval ~= DRL_RET_SUCCESS) then
       dbot.warn("inv.items.trigger.itemDataStats: Failed to set colorName for item " .. objId ..