Skip to content

Commit 3ae5daa

Browse files
committed
yolo
1 parent ec57c55 commit 3ae5daa

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

Datamine/Modules/Collector/CollectorMixin.lua

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,12 @@ local function GetErrorTextForMerchantItem(index)
309309
end
310310

311311
function DatamineCollectorMixin:MERCHANT_SHOW()
312+
C_Timer.After(0.15, function()
313+
self:CollectMerchantData();
314+
end);
315+
end
316+
317+
function DatamineCollectorMixin:CollectMerchantData()
312318
if not Datamine.Settings.ShouldCollectVendorData() then
313319
return;
314320
end
@@ -364,6 +370,7 @@ function DatamineCollectorMixin:MERCHANT_SHOW()
364370

365371
if not info.isPurchasable then
366372
local errorText = GetErrorTextForMerchantItem(i);
373+
assert(errorText ~= "Retrieving item information", "Attempting to log unloaded item. Please tell Ghost.");
367374
item.LockReason = errorText;
368375
end
369376

Datamine_Data/Database.lua

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -618,11 +618,5 @@ function Database:InsertVendorEntry(entry)
618618
self.DB.Vendors = {};
619619
end
620620

621-
local existingEntry = self.DB.Vendors[entry.CreatureID];
622-
if existingEntry then
623-
local newEntry = Mixin(existingEntry, entry);
624-
self.DB.Vendors[entry.CreatureID] = newEntry;
625-
else
626-
self.DB.Vendors[entry.CreatureID] = entry;
627-
end
621+
self.DB.Vendors[entry.CreatureID] = entry;
628622
end

0 commit comments

Comments
 (0)