diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-10-19 18:32:16 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-10-19 18:32:16 +0200 |
| commit | 4abcf7fb337ac2ebe0a121f5ea19bb647addd7c0 (patch) | |
| tree | 5ef69ee63d4e0302101755fd99775ccc0588fa4a /src | |
| parent | a3702cc526cd35d6e0162607d509c241bdefdc63 (diff) | |
Core/Players: Fixed pvp flag being missing when logging in with war mode disabled but pvp enabled
Closes #29336
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1ce4d805716..62a1dc258d5 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -29714,7 +29714,8 @@ void Player::UpdateWarModeAuras() RemoveAurasDueToSpell(auraOutside); RemoveAurasDueToSpell(auraInside); RemovePlayerFlag(PLAYER_FLAGS_WAR_MODE_ACTIVE); - RemovePvpFlag(UNIT_BYTE2_FLAG_PVP); + if (!HasPlayerFlag(PLAYER_FLAGS_IN_PVP)) + RemovePvpFlag(UNIT_BYTE2_FLAG_PVP); RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2::WarModeLeave); } } |