diff options
| author | Killyana <morphone1@gmail.com> | 2017-11-25 19:35:44 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-02-15 19:13:25 +0100 |
| commit | e8b1bb5ca565897b6d39f9740bf0af3a1cf40a59 (patch) | |
| tree | 8b97583fdda9f6245fc2666467045fdf8aaeaed4 /src | |
| parent | 66fa9e11cd5595db92e9267a6673f10f4528433d (diff) | |
Core/Reputation: Fix reaction with rival factions
Closes #9469
Ref #20661
(cherry picked from commit e85a48179e3c1964cc70af1f779fd83eab62d93b)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Reputation/ReputationMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |