From a57883e3634c7153919dda2c0580254e696afd0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <zddm@outlook.es>
Date: Sun, 9 Aug 2020 01:44:17 +0200
Subject: [PATCH] Refactor doAfterEventArgs

---
 .../EntitySystems/DoAfter/DoAfterEventArgs.cs | 51 ++++++++-----------
 1 file changed, 20 insertions(+), 31 deletions(-)

diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs
index dcada9d5cd..dd89f6920b 100644
--- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs
+++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Threading;
 using Robust.Shared.Interfaces.GameObjects;
+// ReSharper disable UnassignedReadonlyField
 
 namespace Content.Server.GameObjects.EntitySystems
 {
@@ -11,7 +12,7 @@ namespace Content.Server.GameObjects.EntitySystems
         ///     The entity invoking do_after
         /// </summary>
         public IEntity User { get; }
-        
+
         /// <summary>
         ///     How long does the do_after require to complete
         /// </summary>
@@ -21,64 +22,52 @@ namespace Content.Server.GameObjects.EntitySystems
         ///     Applicable target (if relevant)
         /// </summary>
         public IEntity? Target { get; }
-        
+
         /// <summary>
         ///     Manually cancel the do_after so it no longer runs
         /// </summary>
         public CancellationToken CancelToken { get; }
-        
+
         // Break the chains
         /// <summary>
         ///     Whether we need to keep our active hand as is (i.e. can't change hand or change item).
         ///     This also covers requiring the hand to be free (if applicable).
         /// </summary>
-        public bool NeedHand { get; }
-        
+        public readonly bool NeedHand;
+
         /// <summary>
         ///     If do_after stops when the user moves
         /// </summary>
-        public bool BreakOnUserMove { get; }
-        
+        public readonly bool BreakOnUserMove;
+
         /// <summary>
         ///     If do_after stops when the target moves (if there is a target)
         /// </summary>
-        public bool BreakOnTargetMove { get; }
-        public bool BreakOnDamage { get; }
-        public bool BreakOnStun { get; }
-        
+        public readonly bool BreakOnTargetMove;
+
+        public readonly bool BreakOnDamage;
+        public readonly bool BreakOnStun;
+
         /// <summary>
         ///     Additional conditions that need to be met. Return false to cancel.
         /// </summary>
-        public Func<bool>? ExtraCheck { get; }
-        
+        public readonly Func<bool>? ExtraCheck;
+
         public DoAfterEventArgs(
-            IEntity user, 
+            IEntity user,
             float delay,
-            CancellationToken cancelToken,
-            IEntity? target = null,
-            bool needHand = true,
-            bool breakOnUserMove = true,
-            bool breakOnTargetMove = true,
-            bool breakOnDamage = true,
-            bool breakOnStun = true,
-            Func<bool>? extraCheck = null
-        )
+            CancellationToken cancelToken = default,
+            IEntity? target = null)
         {
             User = user;
             Delay = delay;
             CancelToken = cancelToken;
             Target = target;
-            NeedHand = needHand;
-            BreakOnUserMove = breakOnUserMove;
-            BreakOnTargetMove = breakOnTargetMove;
-            BreakOnDamage = breakOnDamage;
-            BreakOnStun = breakOnStun;
-            ExtraCheck = extraCheck;
-            
+
             if (Target == null)
             {
                 BreakOnTargetMove = false;
             }
         }
     }
-}
\ No newline at end of file
+}