From e98478b68c82dc3e77ed778b61f48b7495c9d7f3 Mon Sep 17 00:00:00 2001
From: sanderd17 <sanderd17@wildfiregames.com>
Date: Tue, 14 Jan 2014 08:58:11 +0000
Subject: [PATCH] Make sure units in INDIVIDUAL state don't belong to a
 formation. Should fix #2380

This was SVN commit r14581.
---
 binaries/data/mods/public/simulation/components/UnitAI.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js
index 3d0aa83e8a..83bc880e5c 100644
--- a/binaries/data/mods/public/simulation/components/UnitAI.js
+++ b/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -1334,6 +1334,14 @@ var UnitFsmSpec = {
 			// Sanity-checking
 			if (this.IsAnimal())
 				error("Animal got moved into INDIVIDUAL.* state");
+
+			// an entity in individual state shouldn't belong to a formation
+			if (this.IsFormationMember())
+			{
+				var cmpFormation = Engine.QueryInterface(this.formationController, IID_Formation);
+				if (cmpFormation)
+					cmpFormation.RemoveMembers([this.entity]);
+			}
 		},
 
 		"Attacked": function(msg) {