ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/Entities): Improve interactions between taxis and players regarding PvP flag. (#23681)

Browse source
This commit is contained in:
Benjamin Jackson 2025-11-15 03:21:22 -05:00 • committed by GitHub
parent 6b9a8df5dc
commit c552158e99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
View file

@ -418,6 +418,7 @@ void FlightPathMovementGenerator::DoFinalize(Player* player)
player->m_taxi.ClearTaxiDestinations();
player->Dismount();
player->RemoveUnitFlag(UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);
player->UpdatePvPState(); // to account for cases such as flying into a PvP territory, as it does not flag on the way in
if (player->m_taxi.empty())
{
@ -447,6 +448,9 @@ void FlightPathMovementGenerator::DoReset(Player* player)
return;
}
if (player->pvpInfo.EndTimer)
player->UpdatePvP(false, true); // PvP flag timer immediately ends when starting taxi
player->getHostileRefMgr().setOnlineOfflineState(false);
player->AddUnitState(UNIT_STATE_IN_FLIGHT);
player->SetUnitFlag(UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);