Core/Reputation: Fix reaction with rival factions

Port From (https://github.com/TrinityCore/TrinityCore/commit/e8b1bb5ca565897b6d39f9740bf0af3a1cf40a59)
2021-02-18 12:49:14 -05:00
parent 091f8fb881
commit 6a40a6bf7a
1 changed files with 2 additions and 2 deletions
@@ -456,8 +456,8 @@ namespace Game

        void SetAtWar(FactionState faction, bool atWar)
        {
-            // not allow declare war to own faction
-            if (atWar && Convert.ToBoolean(faction.Flags & FactionFlags.PeaceForced))
+            // Do not allow to declare war to our own faction. But allow for rival factions (eg Aldor vs Scryer).
+            if (atWar && faction.Flags.HasAnyFlag(FactionFlags.PeaceForced) && !faction.Flags.HasAnyFlag(FactionFlags.Rival))
                return;

            // already set