From 479646c0e1806372bf552e9fb1dd67c2e858947a Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Fri, 7 Jan 2022 11:35:30 -0500
Subject: [PATCH] Core/Combat: Improve sanctuary combat stop

Port From (https://github.com/TrinityCore/TrinityCore/commit/7779a33142279557ad08111fec6586700ad19606)
---
 Source/Game/Entities/Player/Player.Map.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Game/Entities/Player/Player.Map.cs b/Source/Game/Entities/Player/Player.Map.cs
index 65730e844..f184e2a29 100644
--- a/Source/Game/Entities/Player/Player.Map.cs
+++ b/Source/Game/Entities/Player/Player.Map.cs
@@ -133,7 +133,7 @@ namespace Game.Entities
             {
                 AddPvpFlag(UnitPVPStateFlags.Sanctuary);
                 pvpInfo.IsInNoPvPArea = true;
-                if (duel == null)
+                if (duel == null && GetCombatManager().HasPvPCombat())
                     CombatStopWithPets();
             }
             else