griffkid4/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix cheering issue entering from idle state

Browse Source 
Introduced in e543b01077.
Units entering cheering from idle state, may not check their surrounding
for pottential targets yet, so they will react incorrectly when
attacked.
Pointed out by @Freagarach in
https://code.wildfiregames.com/D1977?id=10404#inline-52415 and turned
out to be issue.

Differential revision: D3455
Fixes: #5966
Reviewed by: @wraitii
This was SVN commit r24774.
This commit is contained in:
Angen 2021-01-23 15:07:15 +00:00
parent 55f741e644
commit 498f5eb083
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/public/simulation/components/UnitAI.js
View File

@ -1523,8 +1523,8 @@ UnitAI.prototype.UnitFsmSpec = {
"IDLE": {
"Order.Cheer": function() {
// Do not cheer if there is no cheering time.
if (!this.cheeringTime)
// Do not cheer if there is no cheering time and we are not idle yet.
if (!this.cheeringTime || !this.isIdle)
return { "discardOrder": true };
this.SetNextState("CHEERING");