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

6
src/server/game/Entities/Unit/Unit.cpp
View file

@ -1864,7 +1864,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
auto canTakeMeleeDamage = [&]()
{
return victim->IsAlive() && !victim->HasUnitState(UNIT_STATE_IN_FLIGHT) && (!victim->IsCreature() || !victim->ToCreature()->IsEvadingAttacks());
return victim->IsAlive() && !victim->IsInFlight() && (!victim->IsCreature() || !victim->ToCreature()->IsEvadingAttacks());
};
if (!canTakeMeleeDamage())
@ -18196,10 +18196,8 @@ void Unit::SetControlled(bool apply, UnitState state, Unit* source /*= nullptr*/
void Unit::SetStunned(bool apply)
{
if (HasUnitState(UNIT_STATE_IN_FLIGHT))
{
if (IsInFlight())
return;
}
if (apply)
{