From 33c24110ddf234750252cc4369b253de849191e9 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 20 May 2009 20:39:55 -0500 Subject: *Fix a bug that player takes fall damage when finishing taxi path. --HG-- branch : trunk --- src/game/WaypointMovementGenerator.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src/game/WaypointMovementGenerator.cpp') diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index effc78d8026..49d38799fe3 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -251,7 +251,6 @@ void FlightPathMovementGenerator::Initialize(Player &player) player.getHostilRefManager().setOnlineOfflineState(false); player.addUnitState(UNIT_STAT_IN_FLIGHT); player.SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT); - player.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2); SetWaypointPathId(player); Traveller traveller(player); // do not send movement, it was sent already @@ -262,26 +261,11 @@ void FlightPathMovementGenerator::Initialize(Player &player) void FlightPathMovementGenerator::Finalize(Player & player) { - // remove flag to prevent send object build movement packets for flight state and crash (movement generator already not at top of stack) player.clearUnitState(UNIT_STAT_IN_FLIGHT); float x, y, z; i_destinationHolder.GetLocationNow(player.GetMapId(), x, y, z); player.SetPosition(x, y, z, player.GetOrientation()); - - player.Unmount(); - player.RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT); - player.RemoveUnitMovementFlag(MOVEMENTFLAG_FLYING2); - - if(player.m_taxi.empty()) - { - player.getHostilRefManager().setOnlineOfflineState(true); - if(player.pvpInfo.inHostileArea) - player.CastSpell(&player, 2479, true); - - player.SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE); - player.StopMoving(); - } } bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff) -- cgit v1.2.3