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

Medical - Add check to FullHealLocal in case unit is burning then extinguish before healing #8622

Merged
merged 2 commits into from
Nov 4, 2021

Conversation

Crowdedlight
Copy link
Contributor

When merged this pull request will:
This will fix the issue described in #8621. It makes full heal extinguish the unit if on fire before healing it. This avoids the issue of a unit on fire that can't be put out by Zeus.

It adds a check to the full heal, if unit is on fire, it sets intensity to 0, which stops the fire.

@PabstMirror PabstMirror added this to the 3.14.1 milestone Oct 25, 2021
@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Oct 25, 2021
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@Crowdedlight
Copy link
Contributor Author

I noticed that the burnCounter is not reset to 0. This could mean that if you are within 2m to the next player that gets put on fire your burnCounter will not start at 0. However it is quite an edge case, as you would have to be within 2m of the next unit when it gets put on fire, otherwise the distance would mean you reset it to 0.

I assume the real solution would be to make the exit of the burn PFH reset the burnCounter.

@PabstMirror PabstMirror merged commit 9ebe427 into acemod:master Nov 4, 2021
MiszczuZPolski pushed a commit to MiszczuZPolski/ACE3 that referenced this pull request Nov 5, 2021
…inguish before healing (acemod#8622)

* added check if burning in fullheal and then extinguish

* Add check if fire module is loaded as PabstMirror showed

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
…inguish before healing (acemod#8622)

* added check if burning in fullheal and then extinguish

* Add check if fire module is loaded as PabstMirror showed

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
…inguish before healing (acemod#8622)

* added check if burning in fullheal and then extinguish

* Add check if fire module is loaded as PabstMirror showed

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
…inguish before healing (acemod#8622)

* added check if burning in fullheal and then extinguish

* Add check if fire module is loaded as PabstMirror showed

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
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