[Loot] Reference loot fix

Author: BAndysc

Modules/WDE.LootEditor/Picker/ViewModels/LootPickerService.cs

@@ -45,7 +45,7 @@ public LootPickerService(IWindowManager windowManager,
         if (!await windowManager.ShowDialog(vm))
             return null;
 
-        return vm.FocusedGroup?.LootEntry ?? vm.Items.FirstOrDefault()?.LootEntry;
+        return vm.AcceptedLootEntry;
     }
 
     public async Task<IReadOnlyList<uint>> PickLoots(LootSourceType lootType)

Modules/WDE.LootEditor/Picker/ViewModels/LootPickerViewModel.cs

@@ -45,7 +45,9 @@ public partial class LootPickerViewModel : ObservableBase, IDialog
 
     private List<LootGroupViewModel> allItems = new();
     public ObservableCollection<LootGroupViewModel> Items { get; } = new();
-    
+
+    public uint? AcceptedLootEntry { get; private set; }
+
     public List<TableTableColumnHeader> Columns { get; } = new()
     {
         new ("Item or currency", 60),
@@ -70,6 +72,18 @@ public LootPickerViewModel(IDatabaseProvider databaseProvider,
         this.lootType = type;
         Accept = new DelegateCommand(() =>
         {
+            if (FocusedGroup != null)
+            {
+                AcceptedLootEntry = FocusedGroup.LootEntry;
+            }
+            else if (uint.TryParse(SearchText, out var lootEntry))
+            {
+                AcceptedLootEntry = lootEntry;
+            }
+            else
+            {
+                AcceptedLootEntry = Items.FirstOrDefault()?.LootEntry;
+            }
             CloseOk?.Invoke();
         });
         Cancel = new DelegateCommand(() =>

WDE.DatabaseEditors/Loaders/DatabaseTableDataProvider.cs

@@ -466,7 +466,7 @@ IEnumerator IEnumerable.GetEnumerator()
 
             public Type ColumnType(int index) => typeof(int);
 
-            public object? Value(int row, int column) => Value<int>(row, column);
+            public object? Value(int row, int column) => Value<long>(row, column);
 
             public T? Value<T>(int row, int column)
             {

WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityMasterMySqlDatabaseProvider.cs

@@ -621,18 +621,18 @@ public override async Task<IReadOnlyList<ILootEntry>> GetReferenceLootCrossRefer
         await using var database = Database();
         var loot = new[]
         {
-            await database.CreatureMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.GameObjectMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.ItemMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.FishingMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.PickpocketingMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.SkinningMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.DisenchantMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.ProspectingMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.MillingMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.MailMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.SpellMasterLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
-            await database.ReferenceLootTemplate.Where(x => x.Reference == lootId).ToListAsync<ILootEntry>(),
+            await database.CreatureMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.GameObjectMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.ItemMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.FishingMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.PickpocketingMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.SkinningMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.DisenchantMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.ProspectingMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.MillingMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.MailMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.SpellMasterLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
+            await database.ReferenceLootTemplate.Where(x => x.ItemOrCurrencyId == lootId && x.LootType == LootType.Reference).ToListAsync<ILootEntry>(),
         };
         return loot.SelectMany(x => x).ToList();
     }