*Merge.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 27014c97f76..41ed4882826 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17583,8 +17583,8 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
     if(nodes.size() < 2)
         return false;
 
-    // not let cheating with start flight in time of logout process || if casting not finished || while in combat || if not use Spell's with EffectSendTaxi
-    if(GetSession()->isLogingOut() || isInCombat())
+    // not let cheating with start flight in time of logout process || while in combat || has type state: stunned || has type state: root
+    if(GetSession()->isLogingOut() || isInCombat() || hasUnitState(UNIT_STAT_STUNNED) || hasUnitState(UNIT_STAT_ROOT))
     {
         WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
         data << uint32(ERR_TAXIPLAYERBUSY);