diff options
| author | Killyana <morphone1@gmail.com> | 2017-11-25 19:35:44 +0100 |
|---|---|---|
| committer | Killyana <morphone1@gmail.com> | 2017-11-25 19:35:44 +0100 |
| commit | e85a48179e3c1964cc70af1f779fd83eab62d93b (patch) | |
| tree | a031466b76736f1d9f9778aa4355eb600ed32a15 /src/server/game/Reputation/ReputationMgr.cpp | |
| parent | bd560fd1609c3dc50ad37559712f85e17ef427db (diff) | |
Core/Reputation: Fix reaction with rival factions
Closes #9469
Ref #20661
Diffstat (limited to 'src/server/game/Reputation/ReputationMgr.cpp')
| -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 b688a212464..3ccec22e7c4 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -463,8 +463,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 |