From 0218e45565e5371b7b055349a347b78eb9c2c1fc Mon Sep 17 00:00:00 2001
From: thenecromancer <none@none>
Date: Mon, 5 Apr 2010 13:09:28 +0200
Subject: Always add CC unit state to allow restoring CC effects if one expires
 (stun in case of root/confuse, and fear in case of everything else) Fixes
 issue #1468

--HG--
branch : trunk
---
 src/game/Unit.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 6f539d92646..1b85d0e566c 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -14748,24 +14748,20 @@ void Unit::SetControlled(bool apply, UnitState state)
         if (hasUnitState(state))
             return;
 
+        addUnitState(state);
         switch(state)
         {
             case UNIT_STAT_STUNNED:
-                addUnitState(state);
                 SetStunned(true);
                 CastStop();
                 break;
             case UNIT_STAT_ROOT:
                 if (!hasUnitState(UNIT_STAT_STUNNED))
-		        {
-		            addUnitState(state);
                     SetRooted(true);
-	 	        }
                 break;
             case UNIT_STAT_CONFUSED:
                 if (!hasUnitState(UNIT_STAT_STUNNED))
 		        {
-		            addUnitState(state);
                     SetConfused(true);
 		            CastStop();
 		        }
@@ -14773,7 +14769,6 @@ void Unit::SetControlled(bool apply, UnitState state)
             case UNIT_STAT_FLEEING:
                 if (!hasUnitState(UNIT_STAT_STUNNED | UNIT_STAT_CONFUSED))
 		        {
-		            addUnitState(state);
                     SetFeared(true);
 		            CastStop();
 		        }
-- 
cgit v1.2.3