Борги могут опять садить на себя людей

space-sunrise · Jan 10, 2025 · 9366ca3 · 9366ca3
1 parent 85ee9eb
commit 9366ca3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Content.Shared/Strip/Components/StrippingComponent.cs b/Content.Shared/Strip/Components/StrippingComponent.cs
@@ -8,7 +8,9 @@ namespace Content.Shared.Strip.Components
     [RegisterComponent, NetworkedComponent]
     public sealed partial class StrippingComponent : Component
     {
+        // Sunrise-Start
         [DataField]
         public bool UseDragDrop = true;
+        // Sunrise-End
     }
 }
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -626,6 +626,13 @@ private void OnDragDrop(EntityUid uid, StrippableComponent component, ref DragDr
         if (args.Handled || args.Target != args.User)
             return;
 
+        // Sunrise-Start
+        if (!TryComp<StrippingComponent>(args.Target, out var strippingComp) || !strippingComp.UseDragDrop)
+        {
+            return;
+        }
+        // Sunrise-End
+
         if (TryOpenStrippingUi(args.User, (uid, component)))
             args.Handled = true;
     }
@@ -655,8 +662,7 @@ private void OnCanDropOn(EntityUid uid, StrippingComponent component, ref CanDro
     private void OnCanDrop(EntityUid uid, StrippableComponent component, ref CanDropDraggedEvent args)
     {
         args.CanDrop |= args.Target == args.User &&
-                        TryComp<StrippingComponent>(args.User, out var strippingComponent) &&
-                        strippingComponent.UseDragDrop &&
+                        HasComp<StrippingComponent>(args.User) &&
                         HasComp<HandsComponent>(args.User);
 
         if (args.CanDrop)