visually functional bags when moving items around

Signed-off-by: Arufonsu <17498701+Arufonsu@users.noreply.github.com>

Author: Arufonsu

Intersect.Client.Core/Interface/Game/Bag/BagItem.cs

@@ -19,15 +19,13 @@ public partial class BagItem : SlotItem
 {
     // Controls
     private readonly Label _quantityLabel;
-    private readonly BagWindow _bagWindow;
 
     // Context Menu Handling
     private readonly MenuItem _withdrawContextItem;
 
-    public BagItem(BagWindow bagWindow, Base parent, int index, ContextMenu contextMenu)
+    public BagItem(Base parent, int index, ContextMenu contextMenu)
         : base(parent, nameof(BagItem), index, contextMenu)
     {
-        _bagWindow = bagWindow;
         TextureFilename = "bagitem.png";
 
         Icon.HoverEnter += Icon_HoverEnter;
@@ -145,6 +143,16 @@ private void Icon_DoubleClicked(Base sender, MouseButtonState arguments)
 
     public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
     {
+        if (Globals.Me is not { } player)
+        {
+            return false;
+        }
+
+        if (Globals.BagSlots is not { Length: > 0 } bagSlots)
+        {
+            return false;
+        }
+
         var targetNode = Interface.FindComponentUnderCursor();
 
         // Find the first parent acceptable in that tree that can accept the package
@@ -154,11 +162,11 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
             {
                 case BagItem bagItem:
                     PacketSender.SendMoveBagItems(SlotIndex, bagItem.SlotIndex);
-                    return true;
+                    return bagSlots[bagItem.SlotIndex] is not { Quantity: > 0 };
 
                 case InventoryItem inventoryItem:
-                    Globals.Me?.TryRetrieveItemFromBag(SlotIndex, inventoryItem.SlotIndex);
-                    return true;
+                    player.TryRetrieveItemFromBag(SlotIndex, inventoryItem.SlotIndex);
+                    return bagSlots[inventoryItem.SlotIndex] is not { Quantity: > 0 };
 
                 default:
                     targetNode = targetNode.Parent;

Intersect.Client.Core/Interface/Game/Bag/BagWindow.cs

@@ -58,7 +58,7 @@ private void InitItemContainer()
 
         for (var slotIndex = 0; slotIndex < bagSlots.Length; slotIndex++)
         {
-            Items.Add(new BagItem(this, _slotContainer, slotIndex, _contextMenu));
+            Items.Add(new BagItem(_slotContainer, slotIndex, _contextMenu));
         }
 
         PopulateSlotContainer.Populate(_slotContainer, Items);