aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
authorMachiavelli <none@none>2009-06-09 21:56:56 +0200
committerMachiavelli <none@none>2009-06-09 21:56:56 +0200
commit1afdfd91066805cac42e4d73fcac78591c139c89 (patch)
treefdeb525bd9bd8dd84351dea70e0c8766a04a101d /src/game/Player.cpp
parent41baf8b0d34dba1bd579831fe77bcc785f857f9b (diff)
parentc5232138f870a8a4e5a59ecb3e0a3228373f58e2 (diff)
Merge
--HG-- branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index d647768d3e0..7099b7e3945 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17437,6 +17437,10 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
// stop combat at start taxi flight if any
CombatStop();
+ StopCastingCharm();
+ StopCastingBindSight();
+ ExitVehicle();
+
// stop trade (client cancel trade at taxi map open but cheating tools can be used for reopen it)
TradeCancel(true);