Skip to content
Permalink
Browse files

Revert "Core/Taxis: Clear taxipath on arrival"

This reverts commit b8f8363.
  • Loading branch information...
AbraKabastard committed May 12, 2019
1 parent 24c59fd commit d04c41a306cfee60b4e313fe21d91cfa5e10548f
Showing with 0 additions and 3 deletions.
  1. +0 −2 src/game/Player.cpp
  2. +0 −1 src/game/WaypointMovementGenerator.cpp
@@ -226,8 +226,6 @@ std::string PlayerTaxi::SaveTaxiDestinationsToString()
if (m_TaxiDestinations.empty())
return "";

ASSERT(m_TaxiDestinations.size() >= 2);

std::ostringstream ss;

for (size_t i = 0; i < m_TaxiDestinations.size(); ++i)
@@ -240,7 +240,6 @@ 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_STATE_IN_FLIGHT);

player.m_taxi.ClearTaxiDestinations();
player.Dismount();
player.RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_REMOVE_CLIENT_CONTROL | UNIT_FLAG_TAXI_FLIGHT);
player.SetClientControl(&player, 1);

1 comment on commit d04c41a

@AbraKabastard

This comment has been minimized.

Copy link
Collaborator Author

commented on d04c41a May 12, 2019

This caused a bug where your flight would stop after first point.

Please sign in to comment.
You can’t perform that action at this time.