diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-03-07 18:08:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-07 18:08:30 +0100 |
| commit | c7974bdf909ceb34821fa3953ef4cb090282fcdf (patch) | |
| tree | 0902a59ce42f46e82f418d5199bcc4dd628de7d3 | |
| parent | 41d80f2d43863588dc4516ee80579f965b07391b (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)
| -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 3342ce3767b..e2f7fe49d91 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7027,7 +7027,7 @@ void Player::UpdateArea(uint32 newArea) { SetByteFlag(UNIT_FIELD_BYTES_2, UNIT_BYTES_2_OFFSET_PVP_FLAG, UNIT_BYTE2_FLAG_SANCTUARY); pvpInfo.IsInNoPvPArea = true; - if (!duel) + if (!duel && GetCombatManager().HasPvPCombat()) CombatStopWithPets(); } else |