upd

Rxup · Mar 21, 2024 · aa70fcc · aa70fcc
1 parent d502e87
commit aa70fcc
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 20 deletions.
diff --git a/Content.Server/Backmen/Arachne/ArachneSystem.cs b/Content.Server/Backmen/Arachne/ArachneSystem.cs
@@ -262,7 +262,7 @@ private void OnSpinWeb(SpinWebActionEvent args)
         var ev = new ArachneWebDoAfterEvent(GetNetCoordinates(coords));
         var doAfterArgs = new DoAfterArgs(EntityManager, args.Performer, arachne.WebDelay, ev, args.Performer)
         {
-            BreakOnUserMove = true,
+            BreakOnMove = true,
         };
 
         _doAfter.TryStartDoAfter(doAfterArgs);
@@ -289,8 +289,7 @@ private void StartCocooning(EntityUid uid, ArachneComponent component, EntityUid
 
         var args = new DoAfterArgs(EntityManager, uid, delay, ev, uid, target: target)
         {
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
         };
 
         _doAfter.TryStartDoAfter(args);

diff --git a/Content.Server/Backmen/Blob/NPC/BlobPod/BlobPodSystem.cs b/Content.Server/Backmen/Blob/NPC/BlobPod/BlobPodSystem.cs
@@ -144,8 +144,7 @@ public void StartZombify(EntityUid uid, EntityUid target, BlobPodComponent? comp
         var ev = new BlobPodZombifyDoAfterEvent();
         var args = new DoAfterArgs(EntityManager, uid, component.ZombifyDelay, ev, uid, target: target)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = false,
+            BreakOnMove = true,
             DistanceThreshold = 2f,
             NeedHand = false
         };

diff --git a/Content.Server/Backmen/Chapel/SacrificialAltarSystem.cs b/Content.Server/Backmen/Chapel/SacrificialAltarSystem.cs
@@ -212,8 +212,7 @@ public void AttemptSacrifice(EntityUid agent, EntityUid patient, EntityUid altar
         var args = new DoAfterArgs(EntityManager, agent, (float) component.SacrificeTime.TotalSeconds, ev, altar, target: patient, used: altar)
         {
             BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             NeedHand = true
         };
 

diff --git a/Content.Server/Backmen/Economy/StoreBankSystem.cs b/Content.Server/Backmen/Economy/StoreBankSystem.cs
@@ -157,8 +157,7 @@ private void OnAfterInteract(EntityUid uid, BuyStoreBankComponent component, Aft
             new RestockDoAfterEvent(), target,
             target: target, used: uid)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             NeedHand = true
         };

diff --git a/Content.Server/Backmen/Flesh/FleshCultistSystem.cs b/Content.Server/Backmen/Flesh/FleshCultistSystem.cs
@@ -338,8 +338,7 @@ private void OnDevourAction(EntityUid uid, FleshCultistComponent component, Fles
                     _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.DevourTime,
                         new FleshCultistDevourDoAfterEvent(), uid, target: target, used: uid)
                     {
-                        BreakOnTargetMove = true,
-                        BreakOnUserMove = true,
+                        BreakOnMove = true,
                     });
                     args.Handled = true;
                     break;

diff --git a/Content.Server/Backmen/Psionics/NPC/GlimmerWisp/GlimmerWispSystem.cs b/Content.Server/Backmen/Psionics/NPC/GlimmerWisp/GlimmerWispSystem.cs
@@ -127,8 +127,7 @@ public void StartLifeDrain(EntityUid uid, EntityUid target, GlimmerWispComponent
             var ev = new GlimmerWispDrainDoAfterEvent();
             var args = new DoAfterArgs(EntityManager ,uid, component.DrainDelay, ev, uid, target: target)
             {
-                BreakOnTargetMove = true,
-                BreakOnUserMove = false,
+                BreakOnMove = true,
                 BreakOnDamage = true,
                 DistanceThreshold = 2f,
                 NeedHand = false

diff --git a/Content.Server/Backmen/Spider/SpiderVampireSystem.cs b/Content.Server/Backmen/Spider/SpiderVampireSystem.cs
@@ -90,7 +90,7 @@ private void OnActionEggUsed(EntityUid uid, SpiderVampireComponent component, Sp
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.UsingEggTime,
             new SpiderVampireEggDoAfterEvent(), uid, used: uid)
         {
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
         });
 

diff --git a/Content.Server/Backmen/Vampiric/BkmVampireLevelingSystem.cs b/Content.Server/Backmen/Vampiric/BkmVampireLevelingSystem.cs
@@ -140,12 +140,11 @@ private void OnUseNewVamp(Entity<BkmVampireComponent> ent, ref InnateNewVampierA
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, ent, TimeSpan.FromSeconds(10),
             new InnateNewVampierDoAfterEvent(), ent, target: args.Target, used: ent)
         {
-            BreakOnUserMove = true,
             BreakOnDamage = true,
             NeedHand = true,
             RequireCanInteract = true,
             BreakOnHandChange = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
             BreakOnWeightlessMove = true
         });
 

diff --git a/Content.Server/Backmen/Vampiric/BloodSuckerSystem.cs b/Content.Server/Backmen/Vampiric/BloodSuckerSystem.cs
@@ -298,8 +298,7 @@ public void StartSuccDoAfter(EntityUid bloodsucker, EntityUid victim, BloodSucke
         var ev = new BloodSuckDoAfterEvent();
         var args = new DoAfterArgs(EntityManager, bloodsucker, bloodSuckerComponent.SuccDelay, ev, bloodsucker, target: victim)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = false,
+            BreakOnMove = true,
             DistanceThreshold = 2f,
             NeedHand = false
         };

diff --git a/Content.Shared/Backmen/Item/PseudoItem/SharedPseudoItemSystem.cs b/Content.Shared/Backmen/Item/PseudoItem/SharedPseudoItemSystem.cs
@@ -102,8 +102,7 @@ private void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, EntityUi
         var ev = new PseudoItemInsertDoAfterEvent();
         var args = new DoAfterArgs(EntityManager, inserter, 5f, ev, toInsert, target: toInsert, used: storageEntity)
         {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
+            BreakOnMove = true,
             NeedHand = true
         };