diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-03-07 18:08:30 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-22 22:36:20 +0100 |
| commit | 7779a33142279557ad08111fec6586700ad19606 (patch) | |
| tree | 9c78421b8ec4d6b989b75301abea2cca8deb5151 | |
| parent | 6dd74533d1603dc6948603ded7a452c6f8a60b29 (diff) | |
Core/Combat: Improve sanctuary combat stop (#24266)
Stop combat when a Player moves to a Sanctuary area only if there is any PvP combat (it would be nice to keep PvE combat but that's still an issue)
(cherry picked from commit c7974bdf909ceb34821fa3953ef4cb090282fcdf)
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 973cd882b9c..304f1277c0d 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7233,7 +7233,7 @@ void Player::UpdateArea(uint32 newArea) { AddPvpFlag(UNIT_BYTE2_FLAG_SANCTUARY); pvpInfo.IsInNoPvPArea = true; - if (!duel) + if (!duel && GetCombatManager().HasPvPCombat()) CombatStopWithPets(); } else |