From e5ee028313b237d2a6210f175ee5fa36723f730c Mon Sep 17 00:00:00 2001 From: Freagarach Date: Sun, 28 Feb 2021 05:51:55 +0000 Subject: [PATCH] Only cancel (un)packing when in the correct state. Differential revision: D3285 This was SVN commit r24955. --- .../public/simulation/components/UnitAI.js | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js index 2b00b103db..89fa51972f 100644 --- a/binaries/data/mods/public/simulation/components/UnitAI.js +++ b/binaries/data/mods/public/simulation/components/UnitAI.js @@ -683,20 +683,6 @@ UnitAI.prototype.UnitFsmSpec = { this.SetNextState("INDIVIDUAL.UNPACKING"); }, - "Order.CancelPack": function(msg) { - var cmpPack = Engine.QueryInterface(this.entity, IID_Pack); - if (cmpPack && cmpPack.IsPacking() && !cmpPack.IsPacked()) - cmpPack.CancelPack(); - this.FinishOrder(); - }, - - "Order.CancelUnpack": function(msg) { - var cmpPack = Engine.QueryInterface(this.entity, IID_Pack); - if (cmpPack && cmpPack.IsPacking() && cmpPack.IsPacked()) - cmpPack.CancelPack(); - this.FinishOrder(); - }, - "Order.MoveToChasingPoint": function(msg) { // Overriden by the CHASING state. // Can however happen outside of it when renaming... @@ -3317,6 +3303,10 @@ UnitAI.prototype.UnitFsmSpec = { return false; }, + "Order.CancelPack": function(msg) { + this.FinishOrder(); + }, + "PackFinished": function(msg) { this.FinishOrder(); }, @@ -3338,6 +3328,10 @@ UnitAI.prototype.UnitFsmSpec = { return false; }, + "Order.CancelUnpack": function(msg) { + this.FinishOrder(); + }, + "PackFinished": function(msg) { this.FinishOrder(); },