Core/Combat: Unify combat permitted checks between CvC and PvC - only require "not friendly" in all cases. Fixes Yogg-Saron encounter. Closes #21380.

Also some bonus cleanup to Yogg's script to make transition cleaner.

1 files changed, 2 insertions, 10 deletions

diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp
index 2f5a4fa87b9..5e315350158 100644
--- a/src/server/game/Combat/CombatManager.cpp
+++ b/src/server/game/Combat/CombatManager.cpp
@@ -44,16 +44,8 @@
         return false;
     if (a->HasUnitState(UNIT_STATE_IN_FLIGHT) || b->HasUnitState(UNIT_STATE_IN_FLIGHT))
         return false;
-    if (a->IsControlledByPlayer() || b->IsControlledByPlayer())
-    { // PvSomething, only block friendly fire
-        if (a->IsFriendlyTo(b) || b->IsFriendlyTo(a))
-            return false;
-    }
-    else
-    { // CvC, need hostile reaction to start a fight
-        if (!a->IsHostileTo(b) && !b->IsHostileTo(a))
-            return false;
-    }
+    if (a->IsFriendlyTo(b) || b->IsFriendlyTo(a))
+        return false;
     Player const* playerA = a->GetCharmerOrOwnerPlayerOrPlayerItself();
     Player const* playerB = b->GetCharmerOrOwnerPlayerOrPlayerItself();
     // ...neither of the two units must be (owned by) a player with .gm on