From e8b1bb5ca565897b6d39f9740bf0af3a1cf40a59 Mon Sep 17 00:00:00 2001 From: Killyana Date: Sat, 25 Nov 2017 19:35:44 +0100 Subject: Core/Reputation: Fix reaction with rival factions Closes #9469 Ref #20661 (cherry picked from commit e85a48179e3c1964cc70af1f779fd83eab62d93b) --- src/server/game/Reputation/ReputationMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index 4e18c5f0978..ba7870c1bc0 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -445,8 +445,8 @@ void ReputationMgr::SetAtWar(RepListID repListID, bool on) void ReputationMgr::SetAtWar(FactionState* faction, bool atWar) const { - // not allow declare war to own faction - if (atWar && (faction->Flags & FACTION_FLAG_PEACE_FORCED)) + // Do not allow to declare war to our own faction. But allow for rival factions (eg Aldor vs Scryer). + if (atWar && (faction->Flags & FACTION_FLAG_PEACE_FORCED) && !(faction->Flags & FACTION_FLAG_RIVAL)) return; // already set -- cgit v1.2.3