From c7974bdf909ceb34821fa3953ef4cb090282fcdf Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Sat, 7 Mar 2020 18:08:30 +0100 Subject: 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) --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3