Check for "cmpHealth" in the "TakeDamage" function in "Armour.js".
AbandonedPublic
Actions

Authored by Freagarach on Jun 30 2019, 8:37 AM.

Details

Reviewers

None

Group Reviewers

Restricted Owners Package

(Owns No Changed Paths)

Summary

As mentioned in D1938, TakeDamage should check for cmpHealth before trying to subtract Health.

Test Plan

Check that everything works as before.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

/ps/trunk

Lint

Lint OK

Unit

No Unit Test Coverage

Build Status

Buildable 8150
Build 13272: Vulcan Build	Jenkins
Build 13271: arc lint + arc unit

Event Timeline

Freagarach created this revision.Jun 30 2019, 8:37 AM

Freagarach mentioned this in D1938: Easier introduction of new damage types..

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (no-else-return):
|    | Unnecessary 'else' after 'return'.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/simulation/components/Armour.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/simulation/components/Armour.js
|  56|  56| 	let cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
|  57|  57| 	if (cmpHealth)
|  58|  58| 		return cmpHealth.Reduce(total);
|  59|    |-	else
|  60|    |-		return { "killed": false, "change": 0 };
|    |  59|+	return { "killed": false, "change": 0 };
|  61|  60| };
|  62|  61| 
|  63|  62| Armour.prototype.GetArmourStrengths = function()
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/differential/1848/display/redirect

Harbormaster completed remote builds in B8120: Diff 8652.Jun 30 2019, 8:45 AM

Stan added a subscriber: Stan.Jun 30 2019, 10:22 AM

Stan added inline comments.