Skip to content

fix: take child result into account in ConditionAction::modify #5042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: take child result into account in ConditionAction::modify #5042

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d49257e
fix: take child result into account in ConditionAction::modify
jdrueckert Jun 6, 2022
0d6d72c
Merge branch 'develop' into fix/condition-action-ignores-child-result
jdrueckert Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rc/main/java/org/terasology/engine/logic/behavior/actions/conditions/ConditionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void construct(Actor actor) {
@Override
public BehaviorState modify(Actor actor, BehaviorState result) {
try {
if (!condition(actor)) {
if (!condition(actor) || result.equals(BehaviorState.FAILURE)) {
return BehaviorState.FAILURE;
}
return BehaviorState.SUCCESS;
Expand Down
Loading