From 063f32efe01f4a56ed8d5495dda0fce1776390bb Mon Sep 17 00:00:00 2001 From: Brandon Lamb Date: Sat, 22 Jul 2017 12:31:43 -0700 Subject: [PATCH] Fix bug in disabled child checking --- addons/com.brandonlamb.bt/selector.gd | 9 +++++---- addons/com.brandonlamb.bt/sequence.gd | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/addons/com.brandonlamb.bt/selector.gd b/addons/com.brandonlamb.bt/selector.gd index 8afba20..5c41c42 100644 --- a/addons/com.brandonlamb.bt/selector.gd +++ b/addons/com.brandonlamb.bt/selector.gd @@ -23,11 +23,12 @@ func tick(actor, ctx): for idx in range(last_child_index, get_child_count()): var child = get_child(idx) - if child.disabled: - break - last_child_index = idx - last_result = child.tick(actor, ctx) + + if child.disabled: + last_result = OK + else: + last_result = child.tick(actor, ctx) if typeof(last_result) == TYPE_OBJECT and last_result extends BehvError: break diff --git a/addons/com.brandonlamb.bt/sequence.gd b/addons/com.brandonlamb.bt/sequence.gd index 3ff529a..d36a7e5 100644 --- a/addons/com.brandonlamb.bt/sequence.gd +++ b/addons/com.brandonlamb.bt/sequence.gd @@ -23,11 +23,12 @@ func tick(actor, ctx): for idx in range(last_child_index, get_child_count()): var child = get_child(idx) - if child.disabled: - break - last_child_index = idx - last_result = child.tick(actor, ctx) + + if child.disabled: + last_result = OK + else: + last_result = child.tick(actor, ctx) if typeof(last_result) == TYPE_OBJECT and last_result extends BehvError: break