From e8f481de01025d9c0fb453ac2324849e1bc5e484 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 18 Dec 2022 20:10:37 -0500
Subject: [PATCH] fix broken forced climbing (#13034)

* fix broken forced climbing

* debug messages
---
 Content.Server/Climbing/ClimbSystem.cs        |  4 +--
 .../BiomassReclaimerSystem.cs                 | 25 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Content.Server/Climbing/ClimbSystem.cs b/Content.Server/Climbing/ClimbSystem.cs
index c952f0526d..1534133b13 100644
--- a/Content.Server/Climbing/ClimbSystem.cs
+++ b/Content.Server/Climbing/ClimbSystem.cs
@@ -118,13 +118,13 @@ public sealed class ClimbSystem : SharedClimbSystem
         if (TryBonk(component, user))
             return;
 
-        _doAfterSystem.DoAfter(new DoAfterEventArgs(entityToMove, component.ClimbDelay, default, climbable, user)
+        _doAfterSystem.DoAfter(new DoAfterEventArgs(user, component.ClimbDelay, default, climbable, entityToMove)
         {
             BreakOnTargetMove = true,
             BreakOnUserMove = true,
             BreakOnDamage = true,
             BreakOnStun = true,
-            UserFinishedEvent = new ClimbFinishedEvent(user, climbable, entityToMove)
+            UsedFinishedEvent = new ClimbFinishedEvent(user, climbable, entityToMove)
         });
     }
 
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index aae82fcc37..f71246e3bf 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -22,7 +22,6 @@ using Content.Server.Mind.Components;
 using Content.Server.Stack;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Configuration;
@@ -153,19 +152,19 @@ namespace Content.Server.Medical.BiomassReclaimer
             if (component.CancelToken != null || args.Target == null)
                 return;
 
-            if (HasComp<MobStateComponent>(args.Used) && CanGib(uid, args.Used, component))
+            if (!HasComp<MobStateComponent>(args.Used) || !CanGib(uid, args.Used, component))
+                return;
+
+            component.CancelToken = new CancellationTokenSource();
+            _doAfterSystem.DoAfter(new DoAfterEventArgs(args.User, 7f, component.CancelToken.Token, args.Target, args.Used)
             {
-                component.CancelToken = new CancellationTokenSource();
-                _doAfterSystem.DoAfter(new DoAfterEventArgs(args.User, 7f, component.CancelToken.Token, target: args.Target)
-                {
-                    BroadcastFinishedEvent = new ReclaimSuccessfulEvent(args.User, args.Used, uid),
-                    BroadcastCancelledEvent = new ReclaimCancelledEvent(uid),
-                    BreakOnTargetMove = true,
-                    BreakOnUserMove = true,
-                    BreakOnStun = true,
-                    NeedHand = true
-                });
-            }
+                BroadcastFinishedEvent = new ReclaimSuccessfulEvent(args.User, args.Used, uid),
+                BroadcastCancelledEvent = new ReclaimCancelledEvent(uid),
+                BreakOnTargetMove = true,
+                BreakOnUserMove = true,
+                BreakOnStun = true,
+                NeedHand = true
+            });
         }
 
         private void OnClimbedOn(EntityUid uid, BiomassReclaimerComponent component, ClimbedOnEvent args)