Refactored abort self into composite base class

Author: ashblue

Assets/FluidBehaviorTree/Scripts/TaskParents/Composites/CompositeBase.cs

@@ -28,5 +28,20 @@ public override void Reset (bool hardReset = false) {
 
             base.Reset(hardReset);
         }
+
+        protected bool AbortSelf (TaskStatus requiredStatus) {
+            if (!AbortType.HasFlag(AbortType.Self)
+                || ChildIndex <= 0
+                || SelfAbortTask == null
+                || SelfAbortTask.Update() != requiredStatus) {
+                return false;
+            }
+            
+            children[ChildIndex].End();
+            Reset();
+            
+            return true;
+
+        }
     }
 }

Assets/FluidBehaviorTree/Scripts/TaskParents/Composites/Selector.cs

@@ -3,12 +3,7 @@
 namespace Adnc.FluidBT.TaskParents {
     public class Selector : CompositeBase {
         protected override TaskStatus OnUpdate () {
-            if (AbortType.HasFlag(AbortType.Self)
-                && ChildIndex > 0
-                && SelfAbortTask != null
-                && SelfAbortTask.Update() == TaskStatus.Success) {
-                children[ChildIndex].End();
-                Reset();
+            if (AbortSelf(TaskStatus.Success)) {
                 return Update();
             }
 

Assets/FluidBehaviorTree/Scripts/TaskParents/Composites/Sequence.cs

@@ -3,12 +3,7 @@
 namespace Adnc.FluidBT.TaskParents {
     public class Sequence : CompositeBase {
         protected override TaskStatus OnUpdate () {
-            if (AbortType.HasFlag(AbortType.Self)
-                && ChildIndex > 0
-                && SelfAbortTask != null
-                && SelfAbortTask.Update() == TaskStatus.Failure) {
-                children[ChildIndex].End();
-                Reset();
+            if (AbortSelf(TaskStatus.Failure)) {
                 return TaskStatus.Failure;
             }