cleanup drag and drop handle drop

Author: WeylonSantana

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

@@ -145,7 +145,7 @@ private void Icon_Clicked(Base sender, MouseButtonState arguments)
 
     private void Icon_DoubleClicked(Base sender, MouseButtonState arguments)
     {
-        if (Globals.InBag)
+        if (arguments.MouseButton is MouseButton.Left)
         {
             Globals.Me?.TryRetrieveItemFromBag(SlotIndex, -1);
         }
@@ -157,7 +157,7 @@ private void Icon_DoubleClicked(Base sender, MouseButtonState arguments)
 
     public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
     {
-        var targetNode = Interface.FindComponentUnderCursor(NodeFilter.None);
+        var targetNode = Interface.FindComponentUnderCursor();
 
         // Find the first parent acceptable in that tree that can accept the package
         while (targetNode != default)
@@ -176,14 +176,9 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
                     targetNode = targetNode.Parent;
                     break;
             }
-            
-            // If we've reached the top of the tree, we can't drop here, so cancel drop
-            if (targetNode == null)
-            {
-                return false;
-            }
         }
 
+        // If we've reached the top of the tree, we can't drop here, so cancel drop
         return false;
     }
 

Intersect.Client.Core/Interface/Game/Bank/BankItem.cs

@@ -183,7 +183,7 @@ private void Icon_DoubleClicked(Base sender, MouseButtonState arguments)
 
     public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
     {
-        var targetNode = Interface.FindComponentUnderCursor(NodeFilter.None);
+        var targetNode = Interface.FindComponentUnderCursor();
 
         // Find the first parent acceptable in that tree that can accept the package
         while (targetNode != default)
@@ -241,14 +241,9 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
                     targetNode = targetNode.Parent;
                     break;
             }
-            
-            // If we've reached the top of the tree, we can't drop here, so cancel drop
-            if (targetNode == null)
-            {
-                return false;
-            }
         }
 
+        // If we've reached the top of the tree, we can't drop here, so cancel drop
         return false;
     }
 

Intersect.Client.Core/Interface/Game/Hotbar/HotbarItem.cs

@@ -222,7 +222,7 @@ private void Icon_HoverEnter(Base sender, EventArgs arguments)
 
     public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
     {
-        var targetNode = Interface.FindComponentUnderCursor(NodeFilter.None);
+        var targetNode = Interface.FindComponentUnderCursor();
 
         // Find the first parent acceptable in that tree that can accept the package
         while (targetNode != default)
@@ -236,14 +236,9 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
             {
                 targetNode = targetNode.Parent;
             }
-
-            // If we've reached the top of the tree, we can't drop here, so cancel drop
-            if (targetNode == null)
-            {
-                return false;
-            }
         }
 
+        // If we've reached the top of the tree, we can't drop here, so cancel drop
         return false;
     }
 

Intersect.Client.Core/Interface/Game/Inventory/InventoryItem.cs

@@ -420,7 +420,7 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
             return true;
         }
 
-        var targetNode = Interface.FindComponentUnderCursor(NodeFilter.None);
+        var targetNode = Interface.FindComponentUnderCursor();
 
         // Find the first parent acceptable in that tree that can accept the package
         while (targetNode != default)
@@ -461,14 +461,9 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
                     targetNode = targetNode.Parent;
                     break;
             }
-
-            // If we've reached the top of the tree, we can't drop here, so return false
-            if (targetNode == null)
-            {
-                return false;
-            }
         }
 
+        // If we've reached the top of the tree, we can't drop here, so cancel drop
         return false;
     }
 

Intersect.Client.Core/Interface/Game/Spells/SpellItem.cs

@@ -161,7 +161,7 @@ private void Icon_DoubleClicked(Base sender, MouseButtonState arguments)
 
     public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
     {
-        var targetNode = Interface.FindComponentUnderCursor(NodeFilter.None);
+        var targetNode = Interface.FindComponentUnderCursor();
 
         // Find the first parent acceptable in that tree that can accept the package
         while (targetNode != default)
@@ -180,14 +180,9 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
                     targetNode = targetNode.Parent;
                     break;
             }
-
-            // If we've reached the top of the tree, we can't drop here, so cancel drop
-            if (targetNode == null)
-            {
-                return false;
-            }
         }
 
+        // If we've reached the top of the tree, we can't drop here, so cancel drop
         return false;
     }