From 3faaf65b086cd192b6e0e1c27e824becc291a1d4 Mon Sep 17 00:00:00 2001
From: Tyfon <29051038+tyfon7@users.noreply.github.com>
Date: Tue, 18 Jun 2024 15:17:11 -0700
Subject: [PATCH] enable ammo merging on direct drop

---
 MultiSelect.cs                | 1 -
 Patches/MultiSelectPatches.cs | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/MultiSelect.cs b/MultiSelect.cs
index 1ed6324..8b5a6d7 100644
--- a/MultiSelect.cs
+++ b/MultiSelect.cs
@@ -196,7 +196,6 @@ namespace UIFixes
 
     public class MultiSelectItemContext(ItemContextAbstractClass itemContext, ItemRotation rotation) : ItemContextClass(itemContext, rotation)
     {
-        public override bool MergeAvailable => false;
         public override bool SplitAvailable => false;
     }
 
diff --git a/Patches/MultiSelectPatches.cs b/Patches/MultiSelectPatches.cs
index 2c3d2f9..de1d9b6 100644
--- a/Patches/MultiSelectPatches.cs
+++ b/Patches/MultiSelectPatches.cs
@@ -570,7 +570,7 @@ namespace UIFixes
                 .Where(ic => ic.Item != itemContext.Item)
                 .OrderByDescending(ic => ic.ItemAddress is GClass2769)
                 .ThenByDescending(ic => itemContext.ItemAddress is GClass2769 originalDraggedAddress && ic.ItemAddress is GClass2769 selectedGridAddress && selectedGridAddress.Grid == originalDraggedAddress.Grid)
-                .ThenByDescending(ic => ic.ItemAddress is GClass2769 selectedGridAddress ? selectedGridAddress.Grid : null)
+                .ThenByDescending(ic => ic.ItemAddress is GClass2769 selectedGridAddress ? selectedGridAddress.Grid.Id : null)
                 .ThenBy(ic => ic.ItemAddress is GClass2769 selectedGridAddress ? gridOrder(selectedGridAddress.LocationInGrid, selectedGridAddress.Grid) : 0);
 
             return prepend ? result.Prepend(itemContext) : result;