Skip to content
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.

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

Fix back blast if damage not allowed #6030

Merged
merged 1 commit into from Jan 7, 2018

Conversation

Projects
None yet
3 participants
@Dystopian
Copy link
Contributor

commented Jan 6, 2018

No description provided.

@PabstMirror PabstMirror added this to the 3.12.1 milestone Jan 7, 2018

@PabstMirror

This comment has been minimized.

Copy link
Collaborator

commented Jan 7, 2018

good catch

TRACE_1("",isDamageAllowed _x);
if (!isDamageAllowed _x) exitWith {}; // Skip damage if not allowed
TRACE_1("",isDamageAllowed _unit);
if (!isDamageAllowed _unit) exitWith {}; // Skip damage if not allowed
_unit setDamage (damage _unit + _damage);

This comment has been minimized.

Copy link
@commy2

commy2 Jan 7, 2018

Contributor

Any reason this is an exitWith when it could be a then for simplicity?

This comment has been minimized.

Copy link
@Dystopian

Dystopian Jan 7, 2018

Author Contributor

I like exitWith :)

This comment has been minimized.

Copy link
@commy2

commy2 Jan 7, 2018

Contributor

Same. But I like classical control structures even more.

This comment has been minimized.

Copy link
@Dystopian

Dystopian Jan 7, 2018

Author Contributor

classical one makes too many indents

This comment has been minimized.

Copy link
@PabstMirror

PabstMirror Jan 7, 2018

Collaborator

I think I might have just been trying to minimize the git diff, which isn't really a good reason

@PabstMirror PabstMirror merged commit e24ed0f into acemod:master Jan 7, 2018

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Dystopian Dystopian deleted the Dystopian:patch-1 branch Jan 7, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.