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
Merged

Conversation

Dystopian
Copy link
Contributor

No description provided.

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Jan 7, 2018
@PabstMirror PabstMirror added this to the 3.12.1 milestone Jan 7, 2018
@PabstMirror
Copy link
Contributor

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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like exitWith :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same. But I like classical control structures even more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

classical one makes too many indents

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
@Dystopian Dystopian deleted the patch-1 branch January 7, 2018 00:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants