From 6a40a6bf7a36545b71575302639814454b8d848d Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 18 Feb 2021 12:49:14 -0500 Subject: [PATCH] Core/Reputation: Fix reaction with rival factions Port From (https://github.com/TrinityCore/TrinityCore/commit/e8b1bb5ca565897b6d39f9740bf0af3a1cf40a59) --- Source/Game/Reputation/ReputationManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Reputation/ReputationManager.cs b/Source/Game/Reputation/ReputationManager.cs index d3f69b6eb..83d74e857 100644 --- a/Source/Game/Reputation/ReputationManager.cs +++ b/Source/Game/Reputation/ReputationManager.cs @@ -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